From d50f7193562045b5b174155f4b73869c0203b51f Mon Sep 17 00:00:00 2001
From: darius <darius@lazarus-ide.org>
Date: Sun, 22 May 2011 19:53:40 +0000
Subject: [PATCH] fix for: http://bugs.freepascal.org/view.php?id=18937

git-svn-id: trunk@30860 -
---
 components/lazsvnpkg/svndiffform.lfm | 62 +++-------------------------
 components/lazsvnpkg/svndiffform.pas | 11 +++--
 2 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/components/lazsvnpkg/svndiffform.lfm b/components/lazsvnpkg/svndiffform.lfm
index bfe5ce0532..e2b94ba6c7 100644
--- a/components/lazsvnpkg/svndiffform.lfm
+++ b/components/lazsvnpkg/svndiffform.lfm
@@ -9,17 +9,17 @@ object SVNDiffFrm: TSVNDiffFrm
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object ButtonPanel: TButtonPanel
     Left = 6
-    Height = 37
-    Top = 423
+    Height = 34
+    Top = 426
     Width = 605
     OKButton.Name = 'OKButton'
     OKButton.Caption = '&OK'
     HelpButton.Name = 'HelpButton'
     HelpButton.Caption = '&Help'
-    HelpButton.Enabled = False
+    HelpButton.OnClick = SaveButtonClick
     CloseButton.Name = 'CloseButton'
     CloseButton.Caption = '&Close'
     CloseButton.Enabled = False
@@ -27,62 +27,12 @@ object SVNDiffFrm: TSVNDiffFrm
     CancelButton.Caption = 'Cancel'
     CancelButton.Enabled = False
     TabOrder = 0
-    ShowButtons = [pbOK]
-    object SaveButton: TBitBtn
-      Left = 6
-      Height = 29
-      Top = 8
-      Width = 109
-      Align = alLeft
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'SaveButton'
-      Constraints.MinHeight = 29
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000683B1EFF834B
-        26FFAC6231FFB76835FFB56835FFB46734FFB26634FFB06533FFAE6433FFAC63
-        32FFAA6232FFA96132FFA86031FFA66031FF9D5B2EFF814B26FFA25C2EFFEBC6
-        ADFFEAC5ADFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
-        F8FFFEFBF8FFFEFBF8FFFEFBF8FFC89A7CFFC79879FF9B592EFFB96B37FFEDCA
-        B3FFE0A27AFFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
-        88FF62C088FF62C088FFFDF9F6FFCA8D65FFC99B7CFFA66031FFBB6C38FFEECC
-        B6FFE1A27AFFFEFAF7FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDC
-        C2FFBFDCC2FFBFDCC2FFFDF9F6FFCD9068FFCC9E81FFA86132FFBB6B38FFEFCE
-        B8FFE1A279FFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
-        88FF62C088FF62C088FFFDF9F6FFCF936AFFCEA384FFAA6132FFBA6A36FFEFD0
-        BBFFE2A27AFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
-        F8FFFEFBF8FFFEFBF8FFFEFBF8FFD3966DFFD2A78AFFAB6232FFBB6A36FFF0D2
-        BEFFE2A37AFFE2A37AFFE1A37AFFE2A37BFFE1A37BFFE0A178FFDE9F77FFDD9F
-        76FFDC9D74FFD99B72FFD89971FFD69970FFD5AB8EFFAD6333FFBB6A36FFF2D5
-        C2FFE3A37AFFE3A37AFFE2A37BFFE2A37BFFE2A47BFFE1A279FFE0A178FFDEA0
-        77FFDE9E75FFDC9D74FFDA9B73FFD99B73FFDAB095FFAF6433FFBB6A36FFF2D8
-        C5FFE3A47BFFE3A37AFFE3A47AFFE2A47BFFE2A37BFFE1A37BFFE1A279FFDFA0
-        77FFDE9F76FFDD9E74FFDB9C72FFDC9D74FFDDB59AFFB16534FFBB6B36FFF4D9
-        C7FFE6A67DFFC88C64FFC98D65FFC98E67FFCB926CFFCB926DFFCA9069FFC88C
-        65FFC88C64FFC88C64FFC88C64FFDA9C74FFE1BA9FFFB36634FFBB6C37FFF4DC
-        C9FFE7A77DFFF9ECE1FFF9ECE1FFF9EDE3FFFCF4EEFFFDFAF7FFFDF7F3FFFAED
-        E5FFF7E7DBFFF7E5D9FFF6E5D8FFDEA077FFE4BEA4FFB46734FFBC6D39FFF5DD
-        CCFFE7A87EFFFAF0E8FFFAF0E8FFC98D66FFFAF0E9FFFDF8F3FFFEFAF8FFFCF4
-        EFFFF9E9DFFFF7E7DBFFF7E5D9FFE0A278FFE7C2A9FFB66835FFB16533FFF6DF
-        D0FFE8A87EFFFCF6F1FFFCF6F1FFC88C64FFFAF1E9FFFBF4EEFFFDFAF7FFFDF9
-        F6FFFAF0E8FFF8E8DDFFF7E6DBFFE1A37AFFEFD5C3FFB66935FF9F5B2EFFF6DF
-        D1FFE9AA80FFFEFAF6FFFDFAF6FFC88C64FFFBF3EEFFFBF1EAFFFCF6F2FFFEFB
-        F8FFFCF6F1FFF9ECE2FFF8E7DBFFEED0BAFFECD0BDFFB66D3CFF724121FFF6E0
-        D1FFF7E0D1FFFEFBF8FFFEFBF7FFFDF9F6FFFCF5F0FFFAF0EAFFFBF2EDFFFDF9
-        F6FFFDFAF7FFFBF1EBFFF8E9DFFFE8CDBAFFBA7F57FF46291500532F18006A3C
-        1EFF96562BFFAF6432FFBC6D39FFBB6C37FFBB6B36FFBB6A36FFBB6A36FFBC6C
-        39FFBD6E3BFFBB6D3AFFAF6434FF955931FF3C23110000000000
-      }
-      NumGlyphs = 0
-      OnClick = SaveButtonClick
-      TabOrder = 4
-    end
+    ShowButtons = [pbOK, pbHelp]
   end
   object SVNDiffMemo: TMemo
     Cursor = crHourGlass
     Left = 6
-    Height = 411
+    Height = 414
     Top = 6
     Width = 605
     Align = alClient
diff --git a/components/lazsvnpkg/svndiffform.pas b/components/lazsvnpkg/svndiffform.pas
index 6fad3f5d34..b487fa31cc 100644
--- a/components/lazsvnpkg/svndiffform.pas
+++ b/components/lazsvnpkg/svndiffform.pas
@@ -31,7 +31,6 @@ type
   { TSVNDiffFrm }
 
   TSVNDiffFrm = class(TForm)
-    SaveButton: TBitBtn;
     ButtonPanel: TButtonPanel;
     SaveDialog: TSaveDialog;
     SVNDiffMemo: TMemo;
@@ -100,8 +99,9 @@ end;
 
 procedure TSVNDiffFrm.FormCreate(Sender: TObject);
 begin
-  SaveButton.Enabled := False;
-  SaveButton.Caption := rsSave;
+  ButtonPanel.HelpButton.Enabled := False;
+  ButtonPanel.HelpButton.Caption := rsSave;
+  ButtonPanel.HelpButton.LoadGlyphFromLazarusResource('laz_save');
 end;
 
 procedure TSVNDiffFrm.SaveButtonClick(Sender: TObject);
@@ -130,7 +130,7 @@ begin
   chdir(FRepoBaseDir);
   CmdLineToMemo(SVNExecutable + ' diff ' + FSwitches + FileNames + ' --non-interactive',
                 SVNDiffMemo);
-  SaveButton.Enabled := True;
+  ButtonPanel.HelpButton.Enabled := True;
 end;
 
 destructor TSVNDiffFrm.Destroy;
@@ -139,5 +139,8 @@ begin
   inherited Destroy;
 end;
 
+initialization
+   {$I ../../images/laz_images.lrs}
+
 end.