From ef0ff2deb6e74632d91fafaceec1e0260eb54ea0 Mon Sep 17 00:00:00 2001 From: Michael Vrhel Date: Fri, 31 May 2013 23:45:45 -0700 Subject: 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. --- winrt/mupdf_cpp/Assets/Logo.Scale-100.png | Bin 0 -> 12690 bytes winrt/mupdf_cpp/Assets/Logo.Scale-140.png | Bin 0 -> 18164 bytes winrt/mupdf_cpp/Assets/Logo.Scale-180.png | Bin 0 -> 19945 bytes winrt/mupdf_cpp/Assets/Logo.Scale-80.png | Bin 0 -> 10749 bytes winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png | Bin 0 -> 5382 bytes winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png | Bin 0 -> 6728 bytes winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png | Bin 0 -> 8026 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-100.png | Bin 0 -> 30014 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-140.png | Bin 0 -> 51342 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-180.png | Bin 0 -> 68929 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-80.png | Bin 0 -> 22486 bytes winrt/mupdf_cpp/Assets/mupdf_logo.png | Bin 12690 -> 0 bytes winrt/mupdf_cpp/Assets/mupdf_storelogo.png | Bin 5382 -> 0 bytes winrt/mupdf_cpp/MainPage.xaml.cpp | 4 +-- winrt/mupdf_cpp/Package.appxmanifest | 16 ++++++------ winrt/mupdf_cpp/mupdf_cpp.vcxproj | 29 ++++++++++++++++++++-- winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters | 33 ++++++++++++++++++++++--- 17 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 winrt/mupdf_cpp/Assets/Logo.Scale-100.png create mode 100644 winrt/mupdf_cpp/Assets/Logo.Scale-140.png create mode 100644 winrt/mupdf_cpp/Assets/Logo.Scale-180.png create mode 100644 winrt/mupdf_cpp/Assets/Logo.Scale-80.png create mode 100644 winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png create mode 100644 winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png create mode 100644 winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png create mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-100.png create mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-140.png create mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-180.png create mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-80.png delete mode 100644 winrt/mupdf_cpp/Assets/mupdf_logo.png delete mode 100644 winrt/mupdf_cpp/Assets/mupdf_storelogo.png (limited to 'winrt') diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-100.png b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png new file mode 100644 index 00000000..ba6b005d Binary files /dev/null and b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png differ diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png new file mode 100644 index 00000000..1b6473d4 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png differ 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 Binary files /dev/null and b/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png differ diff --git a/winrt/mupdf_cpp/Assets/mupdf_logo.png b/winrt/mupdf_cpp/Assets/mupdf_logo.png deleted file mode 100644 index ba6b005d..00000000 Binary files a/winrt/mupdf_cpp/Assets/mupdf_logo.png and /dev/null differ diff --git a/winrt/mupdf_cpp/Assets/mupdf_storelogo.png b/winrt/mupdf_cpp/Assets/mupdf_storelogo.png deleted file mode 100644 index 1b6473d4..00000000 Binary files a/winrt/mupdf_cpp/Assets/mupdf_storelogo.png and /dev/null differ 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 @@ mupdf_cpp - michaelv - Assets\mupdf_storelogo.png + Artifex Software Inc. + Assets\StoreLogo.png 6.2.1 @@ -15,8 +15,8 @@ - - + + @@ -25,16 +25,17 @@ .pdf .xps - .oxps + .cbz + .pdf .xps - .oxps + .cbz @@ -43,6 +44,5 @@ - - + \ 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 @@ - + + + + + true + - + + true + + + true + + + true + + + true + + + true + + + true + + + true + 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 @@ - + Assets - + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + Assets Assets - + + Assets + + + Assets + + Assets -- cgit v1.2.3