From fe411be3511151515f6d8660991f21eb22092ad3 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Sun, 14 Jun 2015 13:13:45 +0000
Subject: [PATCH] * Display session name in caption of all message dialogs. See
 http://www.heidisql.com/forum.php?t=18606 * Add a custom icon for
 confirmation dialogs, with a question mark on it, so we don't have to use the
 "i" icon.

---
 packages/delphiXE5/heidisql.dpr |   1 +
 res/icon-question.rc            |   1 +
 res/icons/icon-question.ico     | Bin 0 -> 4286 bytes
 res/icons/icon-question.pdn     | Bin 0 -> 6655 bytes
 source/helpers.pas              |  24 ++++++++++++++++++------
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 res/icon-question.rc
 create mode 100644 res/icons/icon-question.ico
 create mode 100644 res/icons/icon-question.pdn

diff --git a/packages/delphiXE5/heidisql.dpr b/packages/delphiXE5/heidisql.dpr
index 0cd3460f..9df566f1 100644
--- a/packages/delphiXE5/heidisql.dpr
+++ b/packages/delphiXE5/heidisql.dpr
@@ -44,6 +44,7 @@ uses
   extra_controls in '..\..\source\extra_controls.pas';
 
 {$R ..\..\res\icon.RES}
+{$R ..\..\res\icon-question.RES}
 {$R ..\..\res\version.RES}
 {$R ..\..\res\manifest.RES}
 {$R ..\..\res\updater.RES}
diff --git a/res/icon-question.rc b/res/icon-question.rc
new file mode 100644
index 00000000..c12433d2
--- /dev/null
+++ b/res/icon-question.rc
@@ -0,0 +1 @@
+ICONQUESTION ICON "icons\icon-question.ico"
\ No newline at end of file
diff --git a/res/icons/icon-question.ico b/res/icons/icon-question.ico
new file mode 100644
index 0000000000000000000000000000000000000000..aeef76747be788cf1ce41692254815f56b37dcf9
GIT binary patch
literal 4286
zcmb_geQ1?s6o2L#jY8TVmJ1dw2<nfdaVZ!Pv}D4d2oZ&hg%B)uuPeuNIp)P(rc-m(
zt<k!K=#{jr4g4r`lGSFHNtQUr63P!IUe>+fa59~ngU;#v-j92q_uc#6-BHgtd!LW<
zoZorQInQ~{rc{Cal$R^~R$rGW^@vjHX(5?XRYI6In)NXU=5HbjxM;DyKBxaSFH!5c
zN(HG_Xp=>?#vIlb*j(5FW|kAUT8K+kh+70JA#_`)U+9nuQKv!ZXV(%k7Z(0fmlV&T
z8(+p{8OC*7tb!a7*(sqtBDW?zNnN62kMJesYc#9hgEir=7QUG9PY7*O8$8aF0Z_^V
z{|RF`#1$fERAj^to~3$V{C<tO<tX!uA2Kg#W|lJ=gg)l51|IMp9iloz=O86jJymLu
zj;;rOK+dpI_R5*LTGr3>{lQ$ZBa3I_`hCHRJ=km51F}N2+5v10-1x6{Q&T~Z(z}14
z#>r_)zP{HV_nB?X&+TF^e%G4^dm#g|<UC0)9d!KW!?d>O9U71RNLy34a-TW+lkI)x
z(Q$trU<=5ybV#{<VdGy)Q)N*DrE&hL8A{D(?~$=AK6>S0ZyUfzkOezfzDVjZY2z>3
zPF;^~rtf7uj5sQ4@RtXfh%>$A!UsQmA+jYN<R0N(X#W5C61@bwe>Xxq2d^*(b~2Z>
z=EjFS*!A`_bL^Mgymp)-CarrhA#+B4!1)6^=!3FW>Xm*Pa)A%B_x)dA_(3obhcTfr
zOaT0njeKtHUJ73PJBtnchu`zpp>j8K<hV)b=c^<9X2n4Q_{T2L^1}5rIev!@b@e;(
zmu>f#3v9df|K-o;)(f#^=1Ixp@?N|dr#hTp>~QL>15W&0Hi)0G(U}*5k31=@M`AF6
zH|ymng_mxolkoit$?Uf8^{>}m(D8?^%cHe1KN}!d8!=$MS+x}%6n(OdzJO9Xrrv)l
zGFSG2v)JKmiObB$iEf*_$JizD*C{sGln*|1ao<PW6Pz3OPj46_C%ZBAG5Br#eC%)A
z!q3JH-{=~cx#>Qi{8ifGw7(vI^<Vk>U_Kp=TyW~(XM^fb48BbK>G!Yu^!)hH!z&&e
zd!6|3k8X3jAO6;P|BU?8M8B@yLk)kX^20}7aQg!HT5q*+Z+ygz_`b%te^&l`p_AGl
zYo#N&gLMb<(*btSb%0#GdA*-i(Twk<mXmtY!Z+R@d3$@$)BEQ|j_qsrx9&^k>o=J@
z`j}sfF~9Pe`K}!w(UJY@0o+g2a&mU5hqCVve1JE|%0t7D@5aWs`LGkmZ&dT?T-zhI
z1qbhMT=IVeXGa4z=*AR1|3D*MLH#i^OKGoMyy|o2se68?%r~c)-`F=78##A+)~Y{3
zG^$WnTg}GDx4n;6p$^zLNFPn!W%kkmIlBD>^T~_mJs-R(HvP@?$?}g)yCFXDb|MD=
zdqVWe)L*EpwWi~vzcNM}Y#m?+KVNwH$32I=GxsRfeVRHJg=p-dCSIdK8(lZPt^<4_
z<6*?)Lhc24u?Kr01LwiHys-S{;0we9ViNa4_|nJ^$We$T{jEeFb65ipcu~uto)qk{
zEys9`A5N}$#3b$o>SE*v<S5iBvgZ^q>_|i(b67(ig<1}0Moo*lTGrfu<1T27{D2%)
zB6$+ElH{FpunXR85c-RoXvkiJ&e-!`alQ8Ay}+A=cN1?n2z|_9&1+AtIm3q6?w4d*
z%v80g?H{H3XO&uaN2zDiN-Z5ws!-^`h<x`eRV3d6n-u=Fpp7xV-{dj&49FhHxFxb?
TlzJSpNvSqq@j#&jN*n(RTP1a%

literal 0
HcmV?d00001

diff --git a/res/icons/icon-question.pdn b/res/icons/icon-question.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..c6b3891b57250dd1658ffee1076a47ad112ad032
GIT binary patch
literal 6655
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
PwMn>O>wnkX&Wrs&m9?)U

literal 0
HcmV?d00001

diff --git a/source/helpers.pas b/source/helpers.pas
index 2ccc1921..92783496 100644
--- a/source/helpers.pas
+++ b/source/helpers.pas
@@ -333,7 +333,7 @@ var
   MutexHandle: THandle = 0;
   SystemImageList: TImageList;
   mtCriticalConfirmation: TMsgDlgType = mtCustom;
-
+  ConfirmIcon: TIcon;
 
 implementation
 
@@ -2342,10 +2342,12 @@ begin
       mtWarning: Dialog.Caption := _('Warning');
       mtError: Dialog.Caption := _('Error');
       mtInformation: Dialog.Caption := _('Information');
-      mtConfirmation: Dialog.Caption := _('Confirm');
+      mtConfirmation, mtCustom: Dialog.Caption := _('Confirm');
     end;
     if Title <> Dialog.Caption then
       Dialog.Title := Title;
+    if MainForm.ActiveConnection <> nil then
+      Dialog.Caption := MainForm.ActiveConnection.Parameters.SessionName + ': ' + Dialog.Caption;
     rx := TRegExpr.Create;
     rx.Expression := 'https?\:\/\/\S+';
     Dialog.Text := rx.Replace(Msg, '<a href="$0">$0</a>', True);
@@ -2353,15 +2355,25 @@ begin
 
     // Main icon, and footer link
     case DlgType of
-      mtWarning:      Dialog.MainIcon := tdiWarning;
+      mtWarning:
+        Dialog.MainIcon := tdiWarning;
       mtError: begin
         Dialog.MainIcon := tdiError;
         Dialog.FooterText := '<a href="http://www.google.com/search?q='+EncodeURLParam(Copy(Msg, 1, 1000))+'">'+_('Find some help on this error')+'</a>';
         Dialog.FooterIcon := tdiInformation;
       end;
-      mtInformation:  Dialog.MainIcon := tdiInformation;
-      mtConfirmation: Dialog.MainIcon := tdiInformation;
-      else            Dialog.MainIcon := tdiNone;
+      mtInformation:
+        Dialog.MainIcon := tdiInformation;
+      mtConfirmation, mtCustom: begin
+        if not Assigned(ConfirmIcon) then begin
+          ConfirmIcon := TIcon.Create;
+          ConfirmIcon.LoadFromResourceName(hInstance, 'ICONQUESTION');
+        end;
+        Dialog.Flags := Dialog.Flags + [tfUseHiconMain];
+        Dialog.CustomMainIcon := ConfirmIcon;
+      end;
+      else
+        Dialog.MainIcon := tdiNone;
     end;
 
     // Add buttons