Clean up of assets and manifest in preparation to submit to Windows App store.

Also added CBZ as input.   Removed oxps since there appears to be an issue with that currently.

15 files changed, 67 insertions, 15 deletions

diff --git a/winrt/mupdf_cpp/Assets/mupdf_logo.png b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png
index ba6b005d..ba6b005d 100644
--- a/winrt/mupdf_cpp/Assets/mupdf_logo.png
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png
diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-140.png b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png
new file mode 100644
index 00000000..36898526
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png
diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-180.png b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png
new file mode 100644
index 00000000..ef0d381f
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png
diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-80.png b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png
new file mode 100644
index 00000000..031a3ccd
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png
diff --git a/winrt/mupdf_cpp/Assets/mupdf_storelogo.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png
index 1b6473d4..1b6473d4 100644
--- a/winrt/mupdf_cpp/Assets/mupdf_storelogo.png
+++ b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png
diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png
new file mode 100644
index 00000000..c0aaed7a
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png
diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png
new file mode 100644
index 00000000..69532c59
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png
new file mode 100644
index 00000000..9497ffb5
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png
new file mode 100644
index 00000000..1c6cd7a0
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png
new file mode 100644
index 00000000..7d3391f8
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png
new file mode 100644
index 00000000..471efbda
--- /dev/null
+++ b/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png
diff --git a/winrt/mupdf_cpp/MainPage.xaml.cpp b/winrt/mupdf_cpp/MainPage.xaml.cpp
index e7141a40..dded888e 100644
--- a/winrt/mupdf_cpp/MainPage.xaml.cpp
+++ b/winrt/mupdf_cpp/MainPage.xaml.cpp
@@ -168,10 +168,10 @@ void mupdf_cpp::MainPage::Picker(Platform::Object^ sender, Windows::UI::Xaml::Ro
 
 	FileOpenPicker^ openPicker = ref new FileOpenPicker();
 	openPicker->ViewMode = PickerViewMode::List;
-	openPicker->SuggestedStartLocation = PickerLocationId::PicturesLibrary;
+	openPicker->SuggestedStartLocation = PickerLocationId::DocumentsLibrary;
 	openPicker->FileTypeFilter->Append(".pdf");
 	openPicker->FileTypeFilter->Append(".xps");
-	openPicker->FileTypeFilter->Append(".oxps");
+	openPicker->FileTypeFilter->Append(".cbz");
 
 	create_task(openPicker->PickSingleFileAsync()).then([this](StorageFile^ file)
 	{
diff --git a/winrt/mupdf_cpp/Package.appxmanifest b/winrt/mupdf_cpp/Package.appxmanifest
index 6184bea8..fa810175 100644
--- a/winrt/mupdf_cpp/Package.appxmanifest
+++ b/winrt/mupdf_cpp/Package.appxmanifest
@@ -3,8 +3,8 @@
   <Identity Name="faab8eca-be5e-4e0d-b782-213ccbbc5f34" Publisher="CN=michaelv" Version="1.0.0.0" />
   <Properties>
     <DisplayName>mupdf_cpp</DisplayName>
-    <PublisherDisplayName>michaelv</PublisherDisplayName>
-    <Logo>Assets\mupdf_storelogo.png</Logo>
+    <PublisherDisplayName>Artifex Software Inc.</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Prerequisites>
     <OSMinVersion>6.2.1</OSMinVersion>
@@ -15,8 +15,8 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="mupdf_cpp.App">
-      <VisualElements DisplayName="mupdf_cpp" Logo="Assets\mupdf_logo.png" SmallLogo="Assets\mupdf_smallogo.png" Description="mupdf_cpp" ForegroundText="light" BackgroundColor="#464646">
-        <DefaultTile ShowName="allLogos" />
+      <VisualElements DisplayName="MuPDF" Logo="Assets\Logo.png" SmallLogo="assets/mupdf_smallogo.png" Description="A lightweight, high quality PDF/XPS/CBZ viewer for Windows 8 devices." ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" WideLogo="Assets\WideLogo.png" />
         <SplashScreen Image="Assets\mupdf_splash.png" />
       </VisualElements>
       <Extensions>
@@ -25,16 +25,17 @@
             <SupportedFileTypes>
               <FileType>.pdf</FileType>
               <FileType>.xps</FileType>
-              <FileType>.oxps</FileType>
+              <FileType>.cbz</FileType>
             </SupportedFileTypes>
           </FileOpenPicker>
         </Extension>
         <Extension Category="windows.fileTypeAssociation">
           <FileTypeAssociation Name=".pdf">
+            <EditFlags OpenIsSafe="true" />
             <SupportedFileTypes>
               <FileType>.pdf</FileType>
               <FileType>.xps</FileType>
-              <FileType>.oxps</FileType>
+              <FileType>.cbz</FileType>
             </SupportedFileTypes>
           </FileTypeAssociation>
         </Extension>
@@ -43,6 +44,5 @@
   </Applications>
   <Capabilities>
     <Capability Name="documentsLibrary" />
-    <Capability Name="internetClient" />
   </Capabilities>
-</Package>
+</Package>
\ No newline at end of file
diff --git a/winrt/mupdf_cpp/mupdf_cpp.vcxproj b/winrt/mupdf_cpp/mupdf_cpp.vcxproj
index 9e5c92be..7877d161 100644
--- a/winrt/mupdf_cpp/mupdf_cpp.vcxproj
+++ b/winrt/mupdf_cpp/mupdf_cpp.vcxproj
@@ -190,10 +190,35 @@
     <ClCompile Include="RectList.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Assets\mupdf_logo.png" />
+    <Image Include="Assets\Logo.Scale-100.png" />
+    <Image Include="Assets\Logo.Scale-140.png" />
+    <Image Include="Assets\Logo.Scale-180.png" />
+    <Image Include="Assets\Logo.Scale-80.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
     <Image Include="Assets\mupdf_smallogo.png" />
     <Image Include="Assets\mupdf_splash.png" />
-    <Image Include="Assets\mupdf_storelogo.png" />
+    <Image Include="Assets\StoreLogo.scale-100.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="Assets\StoreLogo.scale-140.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="Assets\StoreLogo.scale-180.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-100.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-140.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-180.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-80.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="mupdf_cpp.rc" />
diff --git a/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters b/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters
index 2d4effa1..65f5f0e0 100644
--- a/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters
+++ b/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters
@@ -39,16 +39,43 @@
     <Page Include="MainPage.xaml" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Assets\mupdf_logo.png">
+    <Image Include="Assets\mupdf_smallogo.png">
       <Filter>Assets</Filter>
     </Image>
-    <Image Include="Assets\mupdf_smallogo.png">
+    <Image Include="Assets\Logo.Scale-80.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Logo.Scale-100.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Logo.Scale-140.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Logo.Scale-180.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-100.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-140.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-180.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\WideLogo.scale-80.png">
       <Filter>Assets</Filter>
     </Image>
     <Image Include="Assets\mupdf_splash.png">
       <Filter>Assets</Filter>
     </Image>
-    <Image Include="Assets\mupdf_storelogo.png">
+    <Image Include="Assets\StoreLogo.scale-100.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.scale-140.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.scale-180.png">
       <Filter>Assets</Filter>
     </Image>
   </ItemGroup>