Updates page of Preferences dialog replaced with simpler Statistics page for Store installations

Source commit: 7dd8cfd58469d58fda0525933e99c8ffbcc29b89

source/forms/Preferences.cpp

@@ -129,6 +129,21 @@ __fastcall TPreferencesDialog::TPreferencesDialog(
 
   AutomaticIniFileStorageLabel->Caption = ExpandEnvironmentVariables(Configuration->GetAutomaticIniFileStorageName(false));
 
+  if (IsUWP())
+  {
+    UpdatesSheet->Caption = LoadStr(PREFERENCES_STATISTICS_CAPTION);
+    int ProxyOffset = UpdatesProxyGroup->Top - UpdatesOptionsGroup->Top - UpdatesOptionsGroup->Height;
+    UpdatesGroup2->Visible = false;
+    UpdatesOptionsGroup->Top = UpdatesGroup2->Top;
+    UpdatesBetaVersionsCombo->Visible = false;
+    UpdatesBetaVersionsLabel->Visible = false;
+    int Offset = UsageViewButton->Top - UpdatesBetaVersionsCombo->Top;
+    CollectUsageCheck->Top = CollectUsageCheck->Top - Offset;
+    UsageViewButton->Top = UsageViewButton->Top - Offset;
+    UpdatesOptionsGroup->Height = UpdatesOptionsGroup->Height - Offset;
+    UpdatesProxyGroup->Top = UpdatesOptionsGroup->Top + UpdatesOptionsGroup->Height + ProxyOffset;
+  }
+
   HideComponentsPanel(this);
 }
 //---------------------------------------------------------------------------
@@ -908,7 +923,24 @@ void __fastcall TPreferencesDialog::SaveConfiguration()
     WinConfiguration->FileColors = TFileColorData::SaveList(FFileColors);
 
     // updates
-    WinConfiguration->Updates = SaveUpdates();
+    TUpdatesConfiguration Updates = SaveUpdates();
+
+    if ((Configuration->CollectUsage != CollectUsageCheck->Checked) && IsUWP())
+    {
+      if (CollectUsageCheck->Checked)
+      {
+        if (Updates.Period == TDateTime(0))
+        {
+          Updates.Period = 7;
+        }
+      }
+      else
+      {
+        Updates.Period = 0;
+      }
+    }
+
+    WinConfiguration->Updates = Updates;
 
     Configuration->CollectUsage = CollectUsageCheck->Checked;
 

source/resource/TextsWin.h

@@ -621,6 +621,7 @@
 #define FILE_COLOR_CAPTION      6019
 #define UPDATES_DONATE_HTML     6020
 #define EDITOR_NEW              6021
+#define PREFERENCES_STATISTICS_CAPTION 6022
 
 // 2xxx is reserved for TextsFileZilla.h
 

source/resource/TextsWin1.rc

@@ -626,6 +626,7 @@ BEGIN
         FILE_COLOR_CAPTION, "File color"
         UPDATES_DONATE_HTML, "To enable automatic updates, please <a href=\"%DONATE_URL%\">donate to WinSCP development</a> or %GET_IMG% WinSCP from <a href=\"%STORE_URL%\">Microsoft Store</a>."
         EDITOR_NEW, "New"
+        PREFERENCES_STATISTICS_CAPTION, "Statistics"
 
         WIN_VARIABLE_STRINGS, "WIN_VARIABLE"
         WINSCP_COPYRIGHT, "Copyright © 2000-2019 Martin Prikryl"