feat: re-enable support for hyperlinks in message dialogues, and use TTaskDialog again for simple messages on Windows

ansgarbecker · ansgarbecker · commit 15eb52b1d98f · 2025-12-31T12:05:22.000+01:00
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -2321,18 +2321,23 @@ function MessageDialog(const Title, Msg: string; DlgType: TMsgDlgType; Buttons:
   end;
 begin
 
+  {$IFNDEF WINDOWS}
   if (KeepAskingSetting = asUnused) and (FooterText.IsEmpty) then begin
-    // Show the more native MessageDlg when we don't need additional dialog features
+    // Show the more native MessageDlg when we don't need additional dialog features.
+    // Especially useful on macOS and Linux where the TTaskDialog looks really different than MessageDlg.
     Result := MessageDlg(Title, Msg, DlgType, Buttons, 0);
     Exit;
   end;
+  {$ENDIF}
 
   // Remember current path and restore it later, so the caller does not try to read from the wrong path after this dialog
   AppSettings.StorePath;
 
   Dialog := TTaskDialog.Create(nil);
   Dialog.Flags := [tfEnableHyperlinks, tfAllowDialogCancellation];
   Dialog.CommonButtons := [];
+  if Assigned(MainForm) then
+    Dialog.OnHyperlinkClicked := MainForm.TaskDialogHyperLinkClicked;
 
   // Caption, title and text
   case DlgType of
@@ -2343,15 +2348,33 @@ function MessageDialog(const Title, Msg: string; DlgType: TMsgDlgType; Buttons:
   end;
   if Title <> Dialog.Caption then
     Dialog.Title := Title;
-  Dialog.Text := Msg;
+  if Assigned(MainForm) and (MainForm.ActiveConnection <> nil) then
+    Dialog.Caption := MainForm.ActiveConnection.Parameters.SessionName + ': ' + Dialog.Caption;
+  rx := TRegExpr.Create;
+  rx.Expression := 'https?://[^\s"]+';
+  if ThemeIsDark then
+    Dialog.Text := Msg
+  else // See issue #2036
+    Dialog.Text := rx.Replace(Msg, '<a href="$0">$0</a>', True);
+  rx.Free;
 
   // Main icon, and footer link
   case DlgType of
     mtWarning:
       Dialog.MainIcon := tdiWarning;
     mtError: begin
       Dialog.MainIcon := tdiError;
-      Dialog.FooterText := FooterText;
+      WebSearchUrl := AppSettings.ReadString(asWebSearchBaseUrl);
+      WebSearchUrl := StringReplace(WebSearchUrl, '%q', EncodeURLParam(Copy(Msg, 1, 1000)), []);
+      rx := TRegExpr.Create;
+      rx.Expression := 'https?://(www\.)?([^/]+)/';
+      if rx.Exec(WebSearchUrl) then
+        WebSearchHost := rx.Match[2]
+      else
+        WebSearchHost := '[unknown host]';
+      rx.Free;
+      Dialog.FooterText := IfThen(FooterText.IsEmpty, '', FooterText + sLineBreak + sLineBreak) +
+        '<a href="'+WebSearchUrl+'">'+_('Find some help on this error')+' (=> '+WebSearchHost+')</a>';
       Dialog.FooterIcon := tdiInformation;
     end;
     mtInformation:
diff --git a/source/main.pas b/source/main.pas
@@ -1379,7 +1379,7 @@   TMainForm = class(TExtForm)
     procedure SetProgressPosition(Value: Integer);
     procedure ProgressStep;
     procedure SetProgressState(State: TProgressbarState);
-    //procedure TaskDialogHyperLinkClicked(Sender: TObject);
+    procedure TaskDialogHyperLinkClicked(Sender: TObject);
     function HasDonated(ForceCheck: Boolean): TThreeStateBoolean;
     procedure ApplyVTFilter(FromTimer: Boolean);
     procedure ApplyFontToGrids;
@@ -14540,7 +14540,6 @@ procedure TMainForm.ApplicationShowHint(var HintStr: string; var CanShow: Boolea
   MainTabIndex, QueryTabIndex, NewHideTimeout: Integer;
   pt: TPoint;
   Conn: TDBConnection;
-  Editor: TSynMemo;
   Infos, HintSQL: TStringList;
   i, PanelIndex, TabIndex: Integer;
   QueryTab: TQueryTab;
@@ -14567,7 +14566,6 @@ procedure TMainForm.ApplicationShowHint(var HintStr: string; var CanShow: Boolea
 
   else if HintInfo.HintControl is TSynMemo then begin
     // Token hint displaying through SynEdit's OnShowHint event
-    Editor := TSynMemo(HintInfo.HintControl);
     NewHideTimeout := Min(Length(HintStr) * 100, 60*1000);
     if NewHideTimeout > HintInfo.HideTimeout then
       HintInfo.HideTimeout := NewHideTimeout;
@@ -14741,12 +14739,12 @@ procedure TMainForm.SetProgressState(State: TProgressbarState);
 end;
 
 
-{procedure TMainForm.TaskDialogHyperLinkClicked(Sender: TObject);
+procedure TMainForm.TaskDialogHyperLinkClicked(Sender: TObject);
 begin
   // Used by hyperlinks in helpers.MessageDialog()
   if Sender is TTaskDialog then
     ShellExec(TTaskDialog(Sender).URL);
-end;}
+end;
 
 
 function TMainForm.HasDonated(ForceCheck: Boolean): TThreeStateBoolean;
