updated ribbon to work on Windows 10 machines

huvanile · Sep 29, 2018 · d5eec4d · d5eec4d
1 parent d9614c3
commit d5eec4d
Show file tree

Hide file tree

Showing 4 changed files with 3,168 additions and 3,150 deletions.
diff --git a/RCS_Clearing/Helpers/browserHelpers.vb b/RCS_Clearing/Helpers/browserHelpers.vb
@@ -1,5 +1,8 @@
-Public Class browserHelpers
-    Public Shared appIE As Object
+Imports SHDocVw
+
+Public Class browserHelpers
+
+    Public Shared appIE As InternetExplorerMedium
 
     ' loop until the page finishes loading``
     Public Shared Sub waitForPageLoad()
@@ -12,7 +15,7 @@
     End Sub
 
     Public Shared Function GetIE() As Object
-        GetIE = CreateObject("InternetExplorer.Application")
+        GetIE = New InternetExplorerMedium
     End Function
 
 End Class
diff --git a/RCS_Clearing/QuickTools.vbproj b/RCS_Clearing/QuickTools.vbproj
@@ -36,10 +36,10 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <PublishUrl>L:\eTools\rcsOutlook\current\</PublishUrl>
+    <PublishUrl>\\dal-fs-001\bas%24\eTools\rcsOutlook\current\</PublishUrl>
     <InstallUrl>\\dal-fs-001\bas%24\eTools\rcsOutlook\current\</InstallUrl>
     <TargetCulture>en</TargetCulture>
-    <ApplicationVersion>1.0.0.7</ApplicationVersion>
+    <ApplicationVersion>1.0.0.9</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>7</UpdateInterval>
@@ -289,6 +289,7 @@
     <EmbeddedResource Include="Taskpanes\tpnStegUnsteg.resx">
       <DependentUpon>tpnStegUnsteg.vb</DependentUpon>
     </EmbeddedResource>
+    <None Include="QuickTools_1_TemporaryKey.pfx" />
     <None Include="QuickTools_TemporaryKey.pfx" />
     <None Include="ThisAddIn.Designer.xml">
       <DependentUpon>ThisAddIn.vb</DependentUpon>
@@ -330,6 +331,26 @@
   <ItemGroup>
     <Content Include="Resources\paypal-donation-button.png" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="MSHTML">
+      <Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
+      <VersionMajor>4</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="SHDocVw">
+      <Guid>{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>1</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -354,10 +375,10 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>QuickTools_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>QuickTools_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>3D72FA18946515AA2615EEBAAAF17C65976C72BD</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>03A3E0D3E52846705397DD8E6D04E045B51F8EED</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <DelaySign>false</DelaySign>
@@ -370,7 +391,7 @@
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{BAA0C2D2-18E2-41B9-852F-F413020CAA33}">
-        <ProjectProperties HostName="Outlook" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="Outlook" Language="vb" TemplatesPath="" DebugInfoExeName="#Software\Microsoft\Office\15.0\Outlook\InstallRoot\Path#outlook.exe" AddItemTemplatesGuid="{5D898164-AEB5-470F-97BA-9253F022FD71}" />
+        <ProjectProperties HostName="Outlook" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="Outlook" Language="vb" TemplatesPath="" DebugInfoExeName="#Software\Microsoft\Office\16.0\Outlook\InstallRoot\Path#outlook.exe" AddItemTemplatesGuid="{5D898164-AEB5-470F-97BA-9253F022FD71}" />
         <Host Name="Outlook" PublishedHash="69C324AB27932AA2FBF2B7EA72250886FF164DE6" IconIndex="0">
           <HostItem Name="ThisAddIn" Code="ThisAddIn.vb" CanonicalName="AddIn" PublishedHash="341B421006973DA6ECFF9E7771C273C5532C588D" CanActivate="false" IconIndex="1" Blueprint="ThisAddIn.Designer.xml" GeneratedCode="ThisAddIn.Designer.vb" />
         </Host>

diff --git a/RCS_Clearing/Ribbons/Ribbon1.Designer.vb b/RCS_Clearing/Ribbons/Ribbon1.Designer.vb