paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-03 01:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

LazSvnPkg improvement. Patch from Bernd Kreuss, issue #19755

Browse Source 
git-svn-id: trunk@31790 -
This commit is contained in:
juha 2011-07-23 15:58:08 +00:00
parent 5a5221944d
commit 60f344e0ac
10 changed files with 108 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lazsvnpkg/svncommitform.lfm
View File

@ -10,14 +10,16 @@ object SVNCommitFrm: TSVNCommitFrm
Caption = 'SVNCommitFrm' Caption = 'SVNCommitFrm'
ClientHeight = 300 ClientHeight = 300
ClientWidth = 675 ClientWidth = 675
OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.31' LCLVersion = '0.9.31'
object ButtonPanel: TButtonPanel object ButtonPanel: TButtonPanel
Left = 6 Left = 6
Height = 34 Height = 38
Top = 260 Top = 256
Width = 663 Width = 663
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.Caption = '&OK' OKButton.Caption = '&OK'
@ -34,7 +36,7 @@ object SVNCommitFrm: TSVNCommitFrm
object SVNCommitMemo: TMemo object SVNCommitMemo: TMemo
Cursor = crHourGlass Cursor = crHourGlass
Left = 6 Left = 6
Height = 248 Height = 244
Top = 6 Top = 6
Width = 663 Width = 663
Align = alClient Align = alClient

16
components/lazsvnpkg/svncommitform.pas
View File

@ -15,7 +15,9 @@ type
TSVNCommitFrm = class(TForm) TSVNCommitFrm = class(TForm)
ButtonPanel: TButtonPanel; ButtonPanel: TButtonPanel;
SVNCommitMemo: TMemo; SVNCommitMemo: TMemo;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure OKButtonClick(Sender: TObject); procedure OKButtonClick(Sender: TObject);
private private
@ -45,7 +47,7 @@ begin
SVNCommitFrm := TSVNCommitFrm.Create(nil); SVNCommitFrm := TSVNCommitFrm.Create(nil);
SVNCommitFrm.SVNCommandLine:=ACmdLine; SVNCommitFrm.SVNCommandLine:=ACmdLine;
SVNCommitFrm.Show; SVNCommitFrm.ShowModal;
end; end;
{ TSVNCommitFrm } { TSVNCommitFrm }
@ -70,8 +72,16 @@ begin
Caption := rsLazarusSVNCommit; Caption := rsLazarusSVNCommit;
end; end;
finalization procedure TSVNCommitFrm.FormDestroy(Sender: TObject);
FreeAndNil(SVNCommitFrm); begin
SVNCommitFrm := nil;
end;
procedure TSVNCommitFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
CloseAction := caFree;
end;
end. end.

7
components/lazsvnpkg/svndiffform.lfm
View File

@ -6,14 +6,15 @@ object SVNDiffFrm: TSVNDiffFrm
Caption = 'SVNDiffFrm' Caption = 'SVNDiffFrm'
ClientHeight = 466 ClientHeight = 466
ClientWidth = 617 ClientWidth = 617
OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.31' LCLVersion = '0.9.31'
object ButtonPanel: TButtonPanel object ButtonPanel: TButtonPanel
Left = 6 Left = 6
Height = 34 Height = 38
Top = 426 Top = 422
Width = 605 Width = 605
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.Caption = '&OK' OKButton.Caption = '&OK'
@ -32,7 +33,7 @@ object SVNDiffFrm: TSVNDiffFrm
end end
inline SVNDiffMemo: TSynEdit inline SVNDiffMemo: TSynEdit
Left = 6 Left = 6
Height = 414 Height = 410
Top = 6 Top = 6
Width = 605 Width = 605
Align = alClient Align = alClient

10
components/lazsvnpkg/svndiffform.pas
View File

@ -35,6 +35,7 @@ type
SaveDialog: TSaveDialog; SaveDialog: TSaveDialog;
SVNDiffMemo: TSynEdit; SVNDiffMemo: TSynEdit;
SynDiffSyn1: TSynDiffSyn; SynDiffSyn1: TSynDiffSyn;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure OKButtonClick(Sender: TObject); procedure OKButtonClick(Sender: TObject);
@ -111,6 +112,11 @@ begin
ButtonPanel.HelpButton.LoadGlyphFromLazarusResource('laz_save'); ButtonPanel.HelpButton.LoadGlyphFromLazarusResource('laz_save');
end; end;
procedure TSVNDiffFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
CloseAction := caFree;
end;
procedure TSVNDiffFrm.SaveButtonClick(Sender: TObject); procedure TSVNDiffFrm.SaveButtonClick(Sender: TObject);
begin begin
if SaveDialog.Execute then if SaveDialog.Execute then
@ -150,11 +156,9 @@ end;
destructor TSVNDiffFrm.Destroy; destructor TSVNDiffFrm.Destroy;
begin begin
FFileList.Free; FFileList.Free;
SVNDiffFrm := nil;
inherited Destroy; inherited Destroy;
end; end;
finalization
FreeAndNil(SVNDiffFrm);
end. end.

23
components/lazsvnpkg/svnlogform.lfm
View File

@ -6,6 +6,7 @@ object SVNLogFrm: TSVNLogFrm
Caption = 'SVNLogFrm' Caption = 'SVNLogFrm'
ClientHeight = 566 ClientHeight = 566
ClientWidth = 726 ClientWidth = 726
OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
@ -18,8 +19,8 @@ object SVNLogFrm: TSVNLogFrm
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 6 Left = 6
Height = 14 Height = 14
Top = 506 Top = 502
Width = 97 Width = 102
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
@ -65,7 +66,7 @@ object SVNLogFrm: TSVNLogFrm
object SVNActionsListView: TListView object SVNActionsListView: TListView
AnchorSideBottom.Control = RefreshButton AnchorSideBottom.Control = RefreshButton
Left = 6 Left = 6
Height = 217 Height = 213
Top = 274 Top = 274
Width = 714 Width = 714
Align = alTop Align = alTop
@ -90,8 +91,8 @@ object SVNLogFrm: TSVNLogFrm
end end
object ButtonPanel: TButtonPanel object ButtonPanel: TButtonPanel
Left = 6 Left = 6
Height = 34 Height = 38
Top = 526 Top = 522
Width = 714 Width = 714
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.Caption = '&OK' OKButton.Caption = '&OK'
@ -130,9 +131,9 @@ object SVNLogFrm: TSVNLogFrm
AnchorSideLeft.Control = Label1 AnchorSideLeft.Control = Label1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideBottom.Control = ButtonPanel AnchorSideBottom.Control = ButtonPanel
Left = 109 Left = 114
Height = 21 Height = 23
Top = 499 Top = 493
Width = 94 Width = 94
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -144,10 +145,10 @@ object SVNLogFrm: TSVNLogFrm
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonPanel AnchorSideBottom.Control = ButtonPanel
Left = 656 Left = 671
Height = 23 Height = 23
Top = 497 Top = 493
Width = 64 Width = 49
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6

35
components/lazsvnpkg/svnlogform.pas
View File

@ -77,6 +77,7 @@ type
SVNLogLimit: TSpinEdit; SVNLogLimit: TSpinEdit;
Splitter1: TSplitter; Splitter1: TSplitter;
Splitter2: TSplitter; Splitter2: TSplitter;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure mnuOpenCurentClick(Sender: TObject); procedure mnuOpenCurentClick(Sender: TObject);
procedure mnuOpenPrevRevisionClick(Sender: TObject); procedure mnuOpenPrevRevisionClick(Sender: TObject);
procedure mnuOpenRevisionClick(Sender: TObject); procedure mnuOpenRevisionClick(Sender: TObject);
@ -279,9 +280,10 @@ end;
procedure TSVNLogFrm.ChangeCursor(ACursor: TCursor); procedure TSVNLogFrm.ChangeCursor(ACursor: TCursor);
begin begin
LogListView.Cursor:=ACursor; //LogListView.Cursor:=ACursor;
SVNLogMsgMemo.Cursor:=ACursor; SVNLogMsgMemo.Cursor:=ACursor;
SVNActionsListView.Cursor:=ACursor; //SVNActionsListView.Cursor:=ACursor;
Self.Cursor:=ACursor;
Application.ProcessMessages; Application.ProcessMessages;
end; end;
@ -313,16 +315,6 @@ begin
Close; Close;
end; end;
procedure TSVNLogFrm.mnuOpenRevisionClick(Sender: TObject);
begin
end;
procedure TSVNLogFrm.mnuOpenPrevRevisionClick(Sender: TObject);
begin
end;
procedure TSVNLogFrm.mnuOpenCurentClick(Sender: TObject); procedure TSVNLogFrm.mnuOpenCurentClick(Sender: TObject);
var var
Path: String; Path: String;
@ -337,6 +329,21 @@ begin
end; end;
end; end;
procedure TSVNLogFrm.mnuOpenPrevRevisionClick(Sender: TObject);
begin
//
end;
procedure TSVNLogFrm.mnuOpenRevisionClick(Sender: TObject);
begin
//
end;
procedure TSVNLogFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
CloseAction := caFree;
end;
procedure TSVNLogFrm.FormCreate(Sender: TObject); procedure TSVNLogFrm.FormCreate(Sender: TObject);
begin begin
LogList := TFPList.Create; LogList := TFPList.Create;
@ -368,6 +375,7 @@ begin
for i := 0 to LogList.Count - 1 do for i := 0 to LogList.Count - 1 do
TSVNLogItem(LogList[i]).Free; TSVNLogItem(LogList[i]).Free;
LogList.Free; LogList.Free;
SVNLogFrm := nil;
end; end;
procedure TSVNLogFrm.Execute(Data: PtrInt); procedure TSVNLogFrm.Execute(Data: PtrInt);
@ -524,8 +532,5 @@ begin
ChangeCursor(crDefault); ChangeCursor(crDefault);
end; end;
finalization
FreeAndNil(SVNLogFrm);
end. end.

35
components/lazsvnpkg/svnstatusform.lfm
View File

@ -8,13 +8,14 @@ object SVNStatusFrm: TSVNStatusFrm
ClientWidth = 738 ClientWidth = 738
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.31' LCLVersion = '0.9.31'
object ButtonPanel: TButtonPanel object ButtonPanel: TButtonPanel
Left = 6 Left = 6
Height = 34 Height = 38
Top = 368 Top = 364
Width = 726 Width = 726
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.Caption = '&Commit' OKButton.Caption = '&Commit'
@ -34,8 +35,8 @@ object SVNStatusFrm: TSVNStatusFrm
end end
object SVNFileListView: TListView object SVNFileListView: TListView
Left = 6 Left = 6
Height = 189 Height = 181
Top = 173 Top = 177
Width = 726 Width = 726
Align = alClient Align = alClient
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -45,39 +46,39 @@ object SVNStatusFrm: TSVNStatusFrm
Columns = < Columns = <
item item
AutoSize = True AutoSize = True
Width = 722 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 10
end end
item item
AutoSize = True AutoSize = True
Width = 15 Width = 624
end> end>
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
RowSelect = True RowSelect = True
@ -91,7 +92,7 @@ object SVNStatusFrm: TSVNStatusFrm
object SVNCommitMsgMemo: TMemo object SVNCommitMsgMemo: TMemo
Left = 6 Left = 6
Height = 135 Height = 135
Top = 33 Top = 37
Width = 726 Width = 726
Align = alTop Align = alTop
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -104,19 +105,19 @@ object SVNStatusFrm: TSVNStatusFrm
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 5
Top = 168 Top = 172
Width = 738 Width = 738
Align = alTop Align = alTop
ResizeAnchor = akTop ResizeAnchor = akTop
end end
object SVNCommitMsgHistoryComboBox: TComboBox object SVNCommitMsgHistoryComboBox: TComboBox
Left = 6 Left = 6
Height = 21 Height = 25
Top = 6 Top = 6
Width = 726 Width = 726
Align = alTop Align = alTop
BorderSpacing.Around = 6 BorderSpacing.Around = 6
ItemHeight = 13 ItemHeight = 0
OnChange = SVNCommitMsgHistoryComboBoxChange OnChange = SVNCommitMsgHistoryComboBoxChange
TabOrder = 4 TabOrder = 4
end end

20
components/lazsvnpkg/svnstatusform.pas
View File

@ -209,7 +209,7 @@ begin
exit; exit;
//commit the checked files //commit the checked files
CmdLine := SVNExecutable + ' commit --force-log '; CmdLine := SVNExecutable + ' commit --non-interactive --force-log ';
for i := 0 to SVNStatus.List.Count - 1 do for i := 0 to SVNStatus.List.Count - 1 do
begin begin
@ -363,7 +363,8 @@ procedure TSVNStatusFrm.ChangeCursor(ACursor: TCursor);
begin begin
Cursor := ACursor; Cursor := ACursor;
SVNCommitMsgMemo.Cursor := ACursor; SVNCommitMsgMemo.Cursor := ACursor;
SVNFileListView.Cursor := ACursor; //SVNFileListView.Cursor := ACursor;
Self.Cursor := ACursor;
Application.ProcessMessages; Application.ProcessMessages;
end; end;
@ -427,6 +428,11 @@ begin
end; end;
end; end;
procedure TSVNStatusFrm.FormDestroy(Sender: TObject);
begin
SVNStatusFrm := nil;
end;
procedure TSVNStatusFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure TSVNStatusFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
var var
Config: TConfigStorage; Config: TConfigStorage;
@ -445,6 +451,8 @@ begin
Config.Free; Config.Free;
end; end;
end; end;
SVNStatus.Free;
CloseAction := caFree;
end; end;
procedure TSVNStatusFrm.CancelButtonClick(Sender: TObject); procedure TSVNStatusFrm.CancelButtonClick(Sender: TObject);
@ -452,13 +460,5 @@ begin
Close; Close;
end; end;
procedure TSVNStatusFrm.FormDestroy(Sender: TObject);
begin
SVNStatus.Free;
end;
finalization
FreeAndNil(SVNStatusFrm);
end. end.

12
components/lazsvnpkg/svnupdateform.lfm
View File

@ -1,18 +1,20 @@
object SVNUpdateFrm: TSVNUpdateFrm object SVNUpdateFrm: TSVNUpdateFrm
Left = 286 Left = 375
Height = 300 Height = 300
Top = 209 Top = 199
Width = 640 Width = 640
Caption = 'SVNUpdateFrm' Caption = 'SVNUpdateFrm'
ClientHeight = 300 ClientHeight = 300
ClientWidth = 640 ClientWidth = 640
OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.31' LCLVersion = '0.9.31'
object SVNUpdateListView: TListView object SVNUpdateListView: TListView
Left = 6 Left = 6
Height = 248 Height = 244
Top = 6 Top = 6
Width = 628 Width = 628
Align = alClient Align = alClient
@ -32,8 +34,8 @@ object SVNUpdateFrm: TSVNUpdateFrm
end end
object ButtonPanel: TButtonPanel object ButtonPanel: TButtonPanel
Left = 6 Left = 6
Height = 34 Height = 38
Top = 260 Top = 256
Width = 628 Width = 628
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.Caption = '&OK' OKButton.Caption = '&OK'

15
components/lazsvnpkg/svnupdateform.pas
View File

@ -35,7 +35,9 @@ type
UpdatePopupMenu: TPopupMenu; UpdatePopupMenu: TPopupMenu;
ButtonPanel: TButtonPanel; ButtonPanel: TButtonPanel;
SVNUpdateListView: TListView; SVNUpdateListView: TListView;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure mnuShowDiffClick(Sender: TObject); procedure mnuShowDiffClick(Sender: TObject);
procedure OKButtonClick(Sender: TObject); procedure OKButtonClick(Sender: TObject);
@ -86,6 +88,16 @@ begin
mnuShowDiff.Caption:=rsShowDiff; mnuShowDiff.Caption:=rsShowDiff;
end; end;
procedure TSVNUpdateFrm.FormDestroy(Sender: TObject);
begin
SVNUpdateFrm := nil;
end;
procedure TSVNUpdateFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
CloseAction := caFree;
end;
procedure TSVNUpdateFrm.FormShow(Sender: TObject); procedure TSVNUpdateFrm.FormShow(Sender: TObject);
begin begin
Caption := Format(rsLazarusSVNUpdate, [RepositoryPath]); Caption := Format(rsLazarusSVNUpdate, [RepositoryPath]);
@ -209,8 +221,5 @@ begin
MemStream.Free; MemStream.Free;
end; end;
finalization
FreeAndNil(SVNUpdateFrm);
end. end.