Merge pull request #1254 from d2phap/develop

v8.5

Author: d2phap

README.md

@@ -12,12 +12,12 @@
 
 ImageGlass is a lightweight software application whose purpose is to help you view images in a clean and intuitive working environment.
 
-It gives you the possibility to view over **80+** common image formats, including `.gif`, `.svg`, `.png`, `.heic`, ... and many more advanced features which help normal users or designers to speed up their work.
+It gives you the possibility to view over **80+** common image formats, including `.gif`, `.svg`, `.png`, `.heic`, ... and many more advanced features which help normal users or designers speed up their work.
 
 
 ## 📥 Download
-[![Total Downloads](https://img.shields.io/github/downloads/d2phap/imageglass/total?color=%233097B8&label=total%20downloads&style=for-the-badge)](https://imageglass.org/download)
-[![Latest Downloads](https://img.shields.io/github/downloads/d2phap/imageglass/latest/total?color=%23932043&label=latest%20version&style=for-the-badge)](https://imageglass.org/download)
+[![Total Downloads](https://img.shields.io/github/downloads/d2phap/imageglass/total?color=%232A7C91&label=total%20downloads&style=for-the-badge)](https://imageglass.org/download)
+[![Latest Downloads](https://img.shields.io/github/downloads/d2phap/imageglass/latest/total?color=%232A7C91&label=latest%20version&style=for-the-badge)](https://imageglass.org/download)
 
 
 
@@ -30,7 +30,7 @@ If you buy ImageGlass on the Microsoft Store, you'll be supporting its developme
 
 
 <a href="https://www.imageglass.org/download" target="_blank" title="View screen shots">
-<img src="https://imageglass.org/upload/photo/release/8.4_1.jpg" alt="ImageGlass 8.4.1.22" width="640">
+<img src="https://imageglass.org/upload/photo/release/8.5_1.jpg" alt="ImageGlass 8.5.1.22" width="640">
 </a><br/>
 
 

Setup/AdvancedInstaller/x64/ImageGlass-x64.aip

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="19.0" Modules="express" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="19.1" Modules="express" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="AI_CURRENT_YEAR" Value="2022" ValueLocId="-"/>
@@ -16,10 +16,10 @@
     <ROW Property="MSIFASTINSTALL" MultiBuildValue="MsiBuild:1"/>
     <ROW Property="Manufacturer" Value="Duong Dieu Phap"/>
     <ROW Property="MsiLogging" MultiBuildValue="MsiBuild:vp"/>
-    <ROW Property="ProductCode" Value="1033:{4510DC5E-9A94-4E31-A9AE-9B6DA1F5B779} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{D4F5D2DA-A799-49B3-A16B-62F389A5D8BA} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ImageGlass"/>
-    <ROW Property="ProductVersion" Value="8.4.1.22" Type="32" TargetFile="ImageGlass.exe"/>
+    <ROW Property="ProductVersion" Value="8.5.1.22" Type="32" TargetFile="ImageGlass.exe"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{877DB994-AB03-4025-B99D-41CE565E810B}"/>
@@ -271,6 +271,7 @@
     <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
     <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
     <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
+    <ROW Fragment="Themes.aip" Path="&lt;AI_FRAGS&gt;Themes.aip"/>
     <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
     <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
     <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>

Setup/AdvancedInstaller/x64/ImageGlass-x64.back (1).aip

@@ -35,7 +35,7 @@ public static class Constants {
         /// If the value read from config file is less than this value,
         /// the First-Launch Configs screen will be launched.
         /// </summary>
-        public const float FIRST_LAUNCH_VERSION = 8.4f;
+        public const float FIRST_LAUNCH_VERSION = 5f;
 
         /// <summary>
         /// The URI Scheme to register web-to-app linking

Setup/AdvancedInstaller/x64/ImageGlass-x64.back.aip

@@ -134,7 +134,7 @@ public static bool SetStartWithOS(bool enable) {
             var reg = new RegistryHelper() {
                 BaseRegistryKey = Registry.CurrentUser,
                 SubKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",
-                ShowError = true,
+                ShowError = false,
             };
 
             if (enable) {

Setup/AdvancedInstaller/x86/ImageGlass-x86.aip

@@ -655,17 +655,6 @@ private void InitDefaultLanguageDictionary() {
 
             #endregion
 
-
-            #region TAB Privacy
-
-            Items.Add("frmSetting.lblPrivacy", "Privacy"); //v8.4
-            Items.Add("frmSetting.chkEnableSpiderService", "Enable Spider service"); //v8.4
-            Items.Add("frmSetting.lnkPrivacy", "Learn more about privacy policy at {0}. To opt out an option, you can uncheck it, then click 'Save' or 'Apply' button below. It will be disabled immediately."); //v8.4
-            Items.Add("frmSetting.lnkSpider._Description", "Share device IP with Spider.com customers to pass traffic through your device."); // v8.4
-            Items.Add("frmSetting.lnkSpider._LearnMore", "Learn more"); // v8.4
-
-            #endregion
-
             #endregion
 
             #region frmAddNewFormat
@@ -695,9 +684,6 @@ private void InitDefaultLanguageDictionary() {
 
             Items.Add("frmFirstLaunch.lblLanguage", "Select Language"); //v5.0
             Items.Add("frmFirstLaunch.lblTheme", "Select Theme"); //v5.0
-            Items.Add("frmFirstLaunch.lnkPrivacy", "Privacy"); //v8.4
-            Items.Add("frmFirstLaunch.lblPrivacyDesctipion", "You can review app privacy policy by clicking the link above."); //v8.4
-            Items.Add("frmFirstLaunch.lblPrivacyDesctipion._Spider", "ImageGlass comes with Spider service by default. You can always disable it in Settings > Privacy."); //v8.4
             Items.Add("frmFirstLaunch.lblDefaultApp", "Set ImageGlass as Default Photo Viewer?"); //v5.0
             Items.Add("frmFirstLaunch.btnSetDefaultApp", "Yes"); //v5.0
             #endregion

…nstaller/x64/ImageGlass-x64.back (2).aip …nstaller/x86/ImageGlass-x86.back (2).aipSetup/AdvancedInstaller/x64/ImageGlass-x64.back (2).aip renamed to Setup/AdvancedInstaller/x86/ImageGlass-x86.back (2).aip Setup/AdvancedInstaller/x64/ImageGlass-x64.back (2).aip renamed to Setup/AdvancedInstaller/x86/ImageGlass-x86.back (2).aip

@@ -89,7 +89,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SpiderService.cs" />
     <Compile Include="ExplorerSortOrder.cs" />
     <Compile Include="InstanceManagement\ArgumentsReceivedEventArgs.cs" />
     <Compile Include="InstanceManagement\NativeMethods.cs" />
@@ -113,7 +112,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Libs\Spider-sdk\x86_64\bs-sdk.dll" Condition="'$(Platform)' == 'x64'" CopyToOutputDirectory="Always" />
     <Content Include="..\..\Libs\ExplorerSortOrder\x86\ExplorerSortOrder.dll" Condition="'$(Platform)' == 'x86'" CopyToOutputDirectory="Always" />
     <Content Include="..\..\Libs\ExplorerSortOrder\x64\ExplorerSortOrder.dll" Condition="'$(Platform)' == 'x64'" CopyToOutputDirectory="Always" />
   </ItemGroup>