Update of a few minor project related items for gsview

5 files changed, 47 insertions, 32 deletions

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">
-
+<!-- To do add in command short cuts and bindings -->
     <Grid>
         <Menu IsMainMenu="True">
             <MenuItem Header="_File">
-                <MenuItem Header="_Open..." Click="OpenFile" Command="Open">
+                <MenuItem Header="_Open..." Click="OpenFile">
                     <MenuItem.Icon>
                         <Image Source="Resources/OpenFile.png" />
                     </MenuItem.Icon>
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 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -99,12 +114,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\mupdfwinrt\mupdfwinrt.vcxproj">
-      <Project>{9e6ab41d-09a7-45a6-a53b-1e4bf3ac5b33}</Project>
-      <Name>mupdfwinrt</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="Resources\Close.ico" />
     <Resource Include="Resources\info.png" />
     <Resource Include="Resources\Message.png" />
@@ -112,6 +121,23 @@
     <Resource Include="Resources\printer.ico" />
     <Resource Include="Resources\saveHS.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/platform/winrt/mupdfnet/mupdfnet.vcxproj b/platform/winrt/mupdfnet/mupdfnet.vcxproj
index d4ce883c..bd8712b4 100644
--- a/platform/winrt/mupdfnet/mupdfnet.vcxproj
+++ b/platform/winrt/mupdfnet/mupdfnet.vcxproj
@@ -183,21 +183,15 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\mupdfwinrt\Cache.h" />
-    <ClInclude Include="..\mupdfwinrt\ContentItem.h" />
-    <ClInclude Include="..\mupdfwinrt\Links.h" />
     <ClInclude Include="..\mupdfwinrt\muctx.h" />
     <ClInclude Include="..\mupdfwinrt\status.h" />
-    <ClInclude Include="..\mupdfwinrt\utils.h" />
+    <ClInclude Include="mudocnet.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\mupdfwinrt\Cache.cpp" />
-    <ClCompile Include="..\mupdfwinrt\ContentItem.cpp" />
-    <ClCompile Include="..\mupdfwinrt\Links.cpp" />
     <ClCompile Include="..\mupdfwinrt\muctx.cpp" />
-    <ClCompile Include="..\mupdfwinrt\utils.cpp" />
+    <ClCompile Include="mudocnet.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/platform/winrt/mupdfnet/mupdfnet.vcxproj.filters b/platform/winrt/mupdfnet/mupdfnet.vcxproj.filters
index 390a6c52..9d151e2f 100644
--- a/platform/winrt/mupdfnet/mupdfnet.vcxproj.filters
+++ b/platform/winrt/mupdfnet/mupdfnet.vcxproj.filters
@@ -8,20 +8,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />
-    <ClCompile Include="..\mupdfwinrt\Cache.cpp" />
-    <ClCompile Include="..\mupdfwinrt\ContentItem.cpp" />
-    <ClCompile Include="..\mupdfwinrt\Links.cpp" />
     <ClCompile Include="..\mupdfwinrt\muctx.cpp" />
-    <ClCompile Include="..\mupdfwinrt\utils.cpp" />
+    <ClCompile Include="mudocnet.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="..\mupdfwinrt\Cache.h" />
-    <ClInclude Include="..\mupdfwinrt\ContentItem.h" />
-    <ClInclude Include="..\mupdfwinrt\Links.h" />
     <ClInclude Include="..\mupdfwinrt\muctx.h" />
     <ClInclude Include="..\mupdfwinrt\status.h" />
-    <ClInclude Include="..\mupdfwinrt\utils.h" />
+    <ClInclude Include="mudocnet.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file