Bläddra i källkod

Clarifying message about missing postal address + Help link for enabling automatic updates

Source commit: 16101d11067346b604417fab029321e3e39faa6b
Martin Prikryl 6 år sedan
förälder
incheckning
33731e1760

+ 1 - 2
source/forms/Preferences.cpp

@@ -2519,9 +2519,8 @@ void __fastcall TPreferencesDialog::UpdatesAuthenticationEmailEditExit(TObject *
           AuthenticationError = MainInstructions(AuthenticationError);
         }
 
-        UnicodeString HelpUrl = GetEnableAutomaticUpdatesUrl();
         unsigned int Result =
-          MoreMessageDialog(AuthenticationError, NULL, qtError, qaIgnore | qaAbort, HelpUrl);
+          MoreMessageDialog(AuthenticationError, NULL, qtError, qaIgnore | qaAbort, HELP_AUTOMATIC_UPDATE);
         if (Result == qaAbort)
         {
           Abort();

+ 1 - 0
source/resource/HelpWin.h

@@ -64,5 +64,6 @@
 #define HELP_SESSION_RENAME          "task_connections#renaming"
 #define HELP_DD_TARGET_UNKNOWN       "ui_pref_dragdrop#fake_file"
 #define HELP_FILE_COLORS             "ui_file_color"
+#define HELP_AUTOMATIC_UPDATE        "updates#automatic_upgrade"
 
 #endif // TextsWin

+ 1 - 1
source/resource/TextsWin1.rc

@@ -84,7 +84,7 @@ BEGIN
         UPDATE_UNAUTHORIZED, "Your email address is not authorized to automatic updates."
         UPDATE_EXPIRED, "Your email address authorization to automatic updates has expired."
         UPDATE_TOO_MANY, "Your email address was blocked to automatic updates due to an excessive use."
-        UPDATE_MISSING_ADDRESS, "To enable automatic updates, please provide us your postal address using a link from your donation receipt."
+        UPDATE_MISSING_ADDRESS, "To enable automatic updates for your e-mail address, please fill in a donation form (including your postal address).\n\nYou will find a link to the form in a receipt, you have received after your donation."
         UPDATE_TOO_LOW, "Your donation is below the limit required to enable automatic updates."
         TIPS_NONE, "No tips."
         KEYGEN_PUBLIC, "Converting public keys is not supported."

+ 2 - 7
source/windows/Setup.cpp

@@ -1186,14 +1186,9 @@ void __fastcall GetUpdatesMessage(UnicodeString & Message, bool & New,
   }
 }
 //---------------------------------------------------------------------------
-UnicodeString __fastcall GetEnableAutomaticUpdatesUrl()
-{
-  return AppendUrlParams(LoadStr(DONATE_URL), L"automaticupdates=1");
-}
-//---------------------------------------------------------------------------
 void __fastcall EnableAutomaticUpdates()
 {
-  OpenBrowser(GetEnableAutomaticUpdatesUrl());
+  ShowHelp(HELP_AUTOMATIC_UPDATE);
 }
 //---------------------------------------------------------------------------
 static void __fastcall OpenHistory(void * /*Data*/, TObject * /*Sender*/, unsigned int & /*Answer*/)
@@ -1545,7 +1540,7 @@ static void __fastcall InsertDonateLink(void * /*Data*/, TObject * Sender)
     InsertPanelToMessageDialog(Dialog, Panel);
 
     UnicodeString DocumentBody = LoadStr(UPDATES_DONATE_HTML);
-    DocumentBody = ReplaceStr(DocumentBody, L"%DONATE_URL%", GetEnableAutomaticUpdatesUrl());
+    DocumentBody = ReplaceStr(DocumentBody, L"%DONATE_URL%", AppendUrlParams(LoadStr(DONATE_URL), L"automaticupdates=1"));
     UnicodeString AboutStoreUrl = LoadStr(ABOUT_STORE_URL);
     DocumentBody = ReplaceStr(DocumentBody, L"%STORE_URL%", AboutStoreUrl);
     UnicodeString StoreButtonUrl = ProgramUrl(LoadStr(STORE_GET_IMG_URL));

+ 0 - 1
source/windows/Setup.h

@@ -15,7 +15,6 @@ void __fastcall GetUpdatesMessage(UnicodeString & Message, bool & New, TQueryTyp
 bool __fastcall CheckForUpdates(bool CachedResults);
 bool __fastcall QueryUpdates(TUpdatesConfiguration & Updates);
 UnicodeString __fastcall FormatUpdatesMessage(UnicodeString Message);
-UnicodeString __fastcall GetEnableAutomaticUpdatesUrl();
 void __fastcall EnableAutomaticUpdates();
 void __fastcall RegisterForDefaultProtocols();
 void __fastcall UnregisterForProtocols();