Update

yuyuvn · Mar 20, 2014 · 9ab1501 · 9ab1501
1 parent eb67eb3
commit 9ab1501
Show file tree

Hide file tree

Showing 29 changed files with 606 additions and 624 deletions.
diff --git a/Grabacr07.Desktop.Metro/Desktop.Metro.csproj b/Grabacr07.Desktop.Metro/Desktop.Metro.csproj
@@ -120,10 +120,6 @@
       <Generator>MSBuild:Compile</Generator>
       <DependentUpon>Controls.xaml</DependentUpon>
     </Page>
-    <Page Include="Styles\Controls.TabView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Styles\Controls.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/Grabacr07.Desktop.Metro/Styles/Controls.TabView.xaml b/Grabacr07.Desktop.Metro/Styles/Controls.TabView.xaml
diff --git a/Grabacr07.Desktop.Metro/Styles/Controls.xaml b/Grabacr07.Desktop.Metro/Styles/Controls.xaml
@@ -4,7 +4,6 @@
 	<ResourceDictionary.MergedDictionaries>
 		<ResourceDictionary Source="pack://application:,,,/Desktop.Metro;component/Styles/Controls.FlatSlider.xaml" />
 		<ResourceDictionary Source="pack://application:,,,/Desktop.Metro;component/Styles/Controls.MetroDialog.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Desktop.Metro;component/Styles/Controls.TabView.xaml" />
 	</ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
diff --git a/Grabacr07.KanColleViewer/App.config b/Grabacr07.KanColleViewer/App.config
@@ -19,7 +19,7 @@
                 <value>37564</value>
             </setting>
             <setting name="KanColleUrl" serializeAs="String">
-                <value>http://www.dmm.com/netgame/social/application/-/detail/=/app_id=854854/</value>
+                <value><![CDATA[http://www.dmm.com/netgame/social/application/-/detail/=/app_id=854854/]]></value>
             </setting>
             <setting name="OverrideStyleSheet" serializeAs="String">
                 <value>body {

diff --git a/Grabacr07.KanColleViewer/KanColleViewer.csproj b/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -211,6 +211,11 @@
     <Compile Include="Views\Controls\KanColleHost.cs" />
     <Compile Include="Views\Controls\WebBrowserHelper.cs" />
     <Compile Include="Views\Behaviors\ZoomAction.cs" />
+    <Compile Include="Views\Converters\AdjustConverter.cs" />
+    <Compile Include="Views\Converters\PreviewSizeConverter.cs" />
+    <Compile Include="Views\Info.xaml.cs">
+      <DependentUpon>Info.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Settings\Updates.xaml.cs">
       <DependentUpon>Updates.xaml</DependentUpon>
     </Compile>
@@ -330,6 +335,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\AdjustConverter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\Generic.AppIcon.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -416,6 +425,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Info.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Settings\Updates.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs