Merge branch 'release/1.1.27'

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v1.1.27
+-------
+
+ - Fix crashes on a small number of machines (#602, #603)
+ - Wrap text on Settings screen (#540)
+ - Improve appearance on high-DPI displays (#559)
+
 v1.1.26
 -------
 

README.md

@@ -205,8 +205,7 @@ If you want to manually upgrade (e.g. to a beta version) you should download Syn
 Building from Source
 --------------------
 
-You'll need [Visual Studio 2017](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx).
-Make sure you install "Blend for Visual Studio SDK for .NET".
+You'll need Visual Studio 2019.
 Clone/download the repository, open `src\SyncTrayzor.sln`, and compile.
 You'll also need to [download syncthing.exe](https://github.com/syncthing/syncthing/releases) and place it in the `bin\x86\Debug`, `bin\x64\Debug`, `bin\x86\Release`, or `bin\x64\Release` folder as appropriate.
 

Rakefile

@@ -199,6 +199,11 @@ namespace :portable do
             cp_to_portable(portable_dir, file)
           end
         end
+        Dir.chdir(File.join(arch_config.installer_dir, 'vc++')) do
+          FileList['*.dll'].each do |file|
+            cp_to_portable(portable_dir, file)
+          end
+        end
         Dir.chdir(arch_config.installer_dir) do
           cp_to_portable(portable_dir, arch_config.syncthing_binaries[PORTABLE_SYNCTHING_VERSION], 'syncthing.exe')
         end
@@ -379,4 +384,30 @@ namespace :tx do
     response = tx_client.upload_source(source_resx)
     puts "Added: #{response['strings_added']}. Updated: #{response['strings_updated']}. Deleted: #{response['strings_delete']}."
   end
+end
+
+namespace :icons do
+  desc "Create a tray icon (pass 256x256 source)"
+  task :"tray-icon", [:source] do |t,args|
+    source = args[:source]
+    # See https://wiki.lazarus.freepascal.org/Windows_Icon
+    sizes = [
+      16, 32, # Normal 96 DPI
+      20, 40, # 120 DPI (125%)
+      24, 48, # 144 DPI (150%)
+      32, 64, # 192 DPI (200%)
+      36, 72, # 225%
+      40, 80, # 250%
+      44, 88, # 275%
+      48, 96, # 300%
+    ].uniq.sort
+    raise "Need a source image" unless source
+    Dir.chdir(File.join('src', 'SyncTrayzor', 'Icons')) do
+      sizes.each do |size|
+        sh 'magick', 'convert', source, '-resize', "#{size}x#{size}", source.pathmap("%n-#{size}%x")
+      end
+      sh 'magick', 'convert', *sizes.map{ |x| source.pathmap("%n-#{x}%x") }, source.pathmap('%n.ico')
+      rm sizes.map{ |x| source.pathmap("%n-#{x}%x") }
+    end    
+  end
 end

installer/common.iss

@@ -25,7 +25,6 @@ AppUpdatesURL={#AppURL}
 DefaultDirName={commonpf}\{#AppName}
 DefaultGroupName={#AppName}
 AllowNoIcons=yes
-LicenseFile={#AppRoot}\LICENSE.txt
 OutputDir="."
 OutputBaseFilename={#AppName}Setup-{#Arch}
 SetupIconFile={#AppSrc}\Icons\default.ico
@@ -40,6 +39,9 @@ RestartApplications=no
 ; However if we close *just* SyncTrayzor, that will take care of shutting down CefSharp and syncthing
 CloseApplicationsFilter=SyncTrayzor.exe
 TouchDate=current
+WizardStyle=modern
+; We do access user areas, but only as a best-effort attempt to clean up after ourselves
+UsedUserAreasWarning=no
 #if "x64" == Arch
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
@@ -66,14 +68,22 @@ Name: "{userappdata}\{#AppDataFolder}"
 ; Near the beginning, as it's extracted first and this makes it cheaper
 Source: "..\{#DotNetInstallerExe}"; DestDir: {tmp}; Flags: dontcopy nocompression noencryption
 
-Source: "{#AppBin}\*"; DestDir: "{app}"; Excludes: "*.xml,*.vshost.*,*.config,*.log,FluentValidation.resources.dll,System.Windows.Interactivity.resources.dll,syncthing.exe,data,logs,cef_extensions.pak,d3dcompiler_47.dll,libEGL.dll,libGLESv2.dll,swiftshader/libEGL.dll,swiftshader/libGLESv2.dll"; Flags: ignoreversion recursesubdirs
+Source: "{#AppBin}\*"; DestDir: "{app}"; Excludes: "*.xml,*.vshost.*,*.config,*.log,*.pdb,FluentValidation.resources.dll,System.Windows.Interactivity.resources.dll,syncthing.exe,data,logs,cef_extensions.pak,d3dcompiler_47.dll,libEGL.dll,libGLESv2.dll,swiftshader/libEGL.dll,swiftshader/libGLESv2.dll"; Flags: ignoreversion recursesubdirs
 Source: "{#AppBin}\SyncTrayzor.exe.Installer.config"; DestDir: "{app}"; DestName: "SyncTrayzor.exe.config"; Flags: ignoreversion
 Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "vc++\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "ucrt\*.dll"; DestDir: "{app}"; Flags: ignoreversion; OnlyBelowVersion: 10.0
 Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
 
+[InstallDelete]
+Type: files; Name: "{app}\msvcp120.dll"
+Type: files; Name: "{app}\msvcr120.dll"
+Type: files; Name: "{app}\vccorlib120.dll"
+Type: files; Name: "{app}\*.pdb"
+Type: files; Name: "{app}\System.Windows.Interactivity.dll"
+
 [Icons]
 Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
@@ -179,8 +189,9 @@ begin
   URLLabel.Parent := WizardForm;
   URLLabel.Font.Style := URLLabel.Font.Style + [fsUnderline];
   URLLabel.Font.Color := clBlue;
-  URLLabel.Top := WizardForm.ClientHeight - URLLabel.Height - 15;
-  URLLabel.Left := ScaleX(10)
+  URLLabel.Top := WizardForm.ClientHeight - URLLabel.Height - 30;
+  URLLabel.Left := ScaleX(20)
+  URLLabel.Anchors := [akLeft, akBottom]
   URLLabel.OnClick := @URLLabelOnClick;
 end;
 

server/version_check.php

@@ -65,7 +65,7 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
-   '1.1.26' => [
+   '1.1.27' => [
       'base_url' => 'https://github.com/canton7/SyncTrayzor/releases/download',
       'installed' => [
          'direct_download_url' => [
@@ -82,7 +82,7 @@ function get_with_wildcard($src, $value, $default = null)
       'sha1sum_download_url' => "{base_url}/v{version}/sha1sum.txt.asc",
       'sha512sum_download_url' => "{base_url}/v{version}/sha512sum.txt.asc",
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v{version}',
-      'release_notes' => "- Add touch support\n- Minor UI updates (#538, #540, #541, #543)\n- Uninstaller tries to remove autostart registry keys (#586)",
+      'release_notes' => "- Add touch support\n- Minor UI updates (#538, #540, #541, #543)\n- Wrap text on Settings screen (#540)\n- Improve appearance on high-DPI displays (#559)\n- Uninstaller tries to remove autostart registry keys (#586)",
    ],
    '1.1.21' => [
       'base_url' => 'https://synctrayzor.antonymale.co.uk/download',
@@ -106,8 +106,9 @@ function get_with_wildcard($src, $value, $default = null)
 ];
 
 $upgrades = [
-   '1.1.25' => ['to' => 'latest', 'formatter' => '5', 'overrides' => ['release_notes' => "- Fix the problems in v1.1.25 (#594, #595, #596, #597)\n- Uninstaller tries to remove autostart registry keys (#586)"]],
-   '1.1.24' => ['to' => 'latest', 'formatter' => '5'],
+   '1.1.26' => ['to' => 'latest', 'formatter' => '5', 'overrides' => ['release_notes' => "- Fix crashes on a small number of machines (#602, #603)\n- Wrap text on Settings screen (#540)\n- Improve appearance on high-DPI displays (#559)"]],
+   '1.1.25' => ['to' => 'latest', 'formatter' => '5', 'overrides' => ['release_notes' => "- Fix the problems in v1.1.25 (#594, #595, #596, #597, #602, #603)\n- Wrap text on Settings screen (#540)\n- Improve appearance on high-DPI displays (#559)\n- Uninstaller tries to remove autostart registry keys (#586)"]],
+   '1.1.24' => ['to' => 'latest', 'formatter' => '5', 'overrides' => ['release_notes' => "- Add touch support\n- Wrap text on Settings screen (#540)\n- Improve appearance on high-DPI displays (#559)\n- Uninstaller tries to remove autostart registry keys (#586)"]],
    '1.1.23' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.22' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.21' => ['to' => 'latest', 'formatter' => '5'],