From 6caf1b523606ce3b282d0dfa45da455867d84429 Mon Sep 17 00:00:00 2001 From: Michael Vrhel Date: Mon, 13 Jan 2014 19:42:35 -0800 Subject: Update of a few minor project related items for gsview --- platform/winrt/gsview/MainWindow.xaml | 4 +-- platform/winrt/gsview/MainWindow.xaml.cs | 17 ++++++----- platform/winrt/gsview/gsview.csproj | 38 ++++++++++++++++++++---- platform/winrt/mupdfnet/mupdfnet.vcxproj | 10 ++----- platform/winrt/mupdfnet/mupdfnet.vcxproj.filters | 10 ++----- 5 files changed, 47 insertions(+), 32 deletions(-) (limited to 'platform') diff --git a/platform/winrt/gsview/MainWindow.xaml b/platform/winrt/gsview/MainWindow.xaml index 3bdeaf8b..5706c547 100644 --- a/platform/winrt/gsview/MainWindow.xaml +++ b/platform/winrt/gsview/MainWindow.xaml @@ -2,11 +2,11 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Title="gsview" Height="350" Width="525"> - + - + diff --git a/platform/winrt/gsview/MainWindow.xaml.cs b/platform/winrt/gsview/MainWindow.xaml.cs index a4f66afc..1e23d84e 100644 --- a/platform/winrt/gsview/MainWindow.xaml.cs +++ b/platform/winrt/gsview/MainWindow.xaml.cs @@ -17,7 +17,6 @@ using mupdfwinrt; using System.Threading.Tasks; using System.Runtime.InteropServices.WindowsRuntime; - enum AppBar_t { TEXT_SEARCH, @@ -181,15 +180,17 @@ namespace gsview var index = filename.LastIndexOfAny(anyOf); string extension = filename.Substring(index + 1); - int result = await mu_doc.OpenFileAsync(filename, extension); + int result = mu_doc.OpenFileName(filename, extension); + + //int result = await mu_doc.OpenFileAsync(filename, extension); /* Check if we need password */ - if (mu_doc.RequiresPassword()) - { + //if (mu_doc.RequiresPassword()) + //{ //SetView(view_t.VIEW_PASSWORD); - return; - } - else - InitialRender(); + // return; + //} + //else + // InitialRender(); } } } diff --git a/platform/winrt/gsview/gsview.csproj b/platform/winrt/gsview/gsview.csproj index b8a512a5..961eab19 100644 --- a/platform/winrt/gsview/gsview.csproj +++ b/platform/winrt/gsview/gsview.csproj @@ -13,6 +13,21 @@ 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -98,12 +113,6 @@ - - - {9e6ab41d-09a7-45a6-a53b-1e4bf3ac5b33} - mupdfwinrt - - @@ -112,6 +121,23 @@ + + + False + Microsoft .NET Framework 4.5 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + +