mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-11-02 07:40:37 +01:00
LazSvnPkg improvement. Patch from Bernd Kreuss, issue #19755
git-svn-id: trunk@31790 -
This commit is contained in:
parent
5a5221944d
commit
60f344e0ac
@ -10,14 +10,16 @@ object SVNCommitFrm: TSVNCommitFrm
|
||||
Caption = 'SVNCommitFrm'
|
||||
ClientHeight = 300
|
||||
ClientWidth = 675
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
OnDestroy = FormDestroy
|
||||
OnShow = FormShow
|
||||
Position = poScreenCenter
|
||||
LCLVersion = '0.9.31'
|
||||
object ButtonPanel: TButtonPanel
|
||||
Left = 6
|
||||
Height = 34
|
||||
Top = 260
|
||||
Height = 38
|
||||
Top = 256
|
||||
Width = 663
|
||||
OKButton.Name = 'OKButton'
|
||||
OKButton.Caption = '&OK'
|
||||
@ -34,7 +36,7 @@ object SVNCommitFrm: TSVNCommitFrm
|
||||
object SVNCommitMemo: TMemo
|
||||
Cursor = crHourGlass
|
||||
Left = 6
|
||||
Height = 248
|
||||
Height = 244
|
||||
Top = 6
|
||||
Width = 663
|
||||
Align = alClient
|
||||
|
||||
@ -15,7 +15,9 @@ type
|
||||
TSVNCommitFrm = class(TForm)
|
||||
ButtonPanel: TButtonPanel;
|
||||
SVNCommitMemo: TMemo;
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure OKButtonClick(Sender: TObject);
|
||||
private
|
||||
@ -45,7 +47,7 @@ begin
|
||||
SVNCommitFrm := TSVNCommitFrm.Create(nil);
|
||||
|
||||
SVNCommitFrm.SVNCommandLine:=ACmdLine;
|
||||
SVNCommitFrm.Show;
|
||||
SVNCommitFrm.ShowModal;
|
||||
end;
|
||||
|
||||
{ TSVNCommitFrm }
|
||||
@ -70,8 +72,16 @@ begin
|
||||
Caption := rsLazarusSVNCommit;
|
||||
end;
|
||||
|
||||
finalization
|
||||
FreeAndNil(SVNCommitFrm);
|
||||
procedure TSVNCommitFrm.FormDestroy(Sender: TObject);
|
||||
begin
|
||||
SVNCommitFrm := nil;
|
||||
end;
|
||||
|
||||
procedure TSVNCommitFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
begin
|
||||
CloseAction := caFree;
|
||||
end;
|
||||
|
||||
|
||||
end.
|
||||
|
||||
|
||||
@ -6,14 +6,15 @@ object SVNDiffFrm: TSVNDiffFrm
|
||||
Caption = 'SVNDiffFrm'
|
||||
ClientHeight = 466
|
||||
ClientWidth = 617
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
OnShow = FormShow
|
||||
Position = poScreenCenter
|
||||
LCLVersion = '0.9.31'
|
||||
object ButtonPanel: TButtonPanel
|
||||
Left = 6
|
||||
Height = 34
|
||||
Top = 426
|
||||
Height = 38
|
||||
Top = 422
|
||||
Width = 605
|
||||
OKButton.Name = 'OKButton'
|
||||
OKButton.Caption = '&OK'
|
||||
@ -32,7 +33,7 @@ object SVNDiffFrm: TSVNDiffFrm
|
||||
end
|
||||
inline SVNDiffMemo: TSynEdit
|
||||
Left = 6
|
||||
Height = 414
|
||||
Height = 410
|
||||
Top = 6
|
||||
Width = 605
|
||||
Align = alClient
|
||||
|
||||
@ -35,6 +35,7 @@ type
|
||||
SaveDialog: TSaveDialog;
|
||||
SVNDiffMemo: TSynEdit;
|
||||
SynDiffSyn1: TSynDiffSyn;
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure OKButtonClick(Sender: TObject);
|
||||
@ -111,6 +112,11 @@ begin
|
||||
ButtonPanel.HelpButton.LoadGlyphFromLazarusResource('laz_save');
|
||||
end;
|
||||
|
||||
procedure TSVNDiffFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
begin
|
||||
CloseAction := caFree;
|
||||
end;
|
||||
|
||||
procedure TSVNDiffFrm.SaveButtonClick(Sender: TObject);
|
||||
begin
|
||||
if SaveDialog.Execute then
|
||||
@ -150,11 +156,9 @@ end;
|
||||
destructor TSVNDiffFrm.Destroy;
|
||||
begin
|
||||
FFileList.Free;
|
||||
SVNDiffFrm := nil;
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
finalization
|
||||
FreeAndNil(SVNDiffFrm);
|
||||
|
||||
end.
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@ object SVNLogFrm: TSVNLogFrm
|
||||
Caption = 'SVNLogFrm'
|
||||
ClientHeight = 566
|
||||
ClientWidth = 726
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
OnDestroy = FormDestroy
|
||||
OnShow = FormShow
|
||||
@ -18,8 +19,8 @@ object SVNLogFrm: TSVNLogFrm
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 14
|
||||
Top = 506
|
||||
Width = 97
|
||||
Top = 502
|
||||
Width = 102
|
||||
Anchors = [akLeft, akBottom]
|
||||
BorderSpacing.Left = 6
|
||||
BorderSpacing.Right = 6
|
||||
@ -65,7 +66,7 @@ object SVNLogFrm: TSVNLogFrm
|
||||
object SVNActionsListView: TListView
|
||||
AnchorSideBottom.Control = RefreshButton
|
||||
Left = 6
|
||||
Height = 217
|
||||
Height = 213
|
||||
Top = 274
|
||||
Width = 714
|
||||
Align = alTop
|
||||
@ -90,8 +91,8 @@ object SVNLogFrm: TSVNLogFrm
|
||||
end
|
||||
object ButtonPanel: TButtonPanel
|
||||
Left = 6
|
||||
Height = 34
|
||||
Top = 526
|
||||
Height = 38
|
||||
Top = 522
|
||||
Width = 714
|
||||
OKButton.Name = 'OKButton'
|
||||
OKButton.Caption = '&OK'
|
||||
@ -130,9 +131,9 @@ object SVNLogFrm: TSVNLogFrm
|
||||
AnchorSideLeft.Control = Label1
|
||||
AnchorSideLeft.Side = asrBottom
|
||||
AnchorSideBottom.Control = ButtonPanel
|
||||
Left = 109
|
||||
Height = 21
|
||||
Top = 499
|
||||
Left = 114
|
||||
Height = 23
|
||||
Top = 493
|
||||
Width = 94
|
||||
Anchors = [akLeft, akBottom]
|
||||
BorderSpacing.Around = 6
|
||||
@ -144,10 +145,10 @@ object SVNLogFrm: TSVNLogFrm
|
||||
AnchorSideRight.Control = Owner
|
||||
AnchorSideRight.Side = asrBottom
|
||||
AnchorSideBottom.Control = ButtonPanel
|
||||
Left = 656
|
||||
Left = 671
|
||||
Height = 23
|
||||
Top = 497
|
||||
Width = 64
|
||||
Top = 493
|
||||
Width = 49
|
||||
Anchors = [akRight, akBottom]
|
||||
AutoSize = True
|
||||
BorderSpacing.Around = 6
|
||||
|
||||
@ -77,6 +77,7 @@ type
|
||||
SVNLogLimit: TSpinEdit;
|
||||
Splitter1: TSplitter;
|
||||
Splitter2: TSplitter;
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure mnuOpenCurentClick(Sender: TObject);
|
||||
procedure mnuOpenPrevRevisionClick(Sender: TObject);
|
||||
procedure mnuOpenRevisionClick(Sender: TObject);
|
||||
@ -279,9 +280,10 @@ end;
|
||||
|
||||
procedure TSVNLogFrm.ChangeCursor(ACursor: TCursor);
|
||||
begin
|
||||
LogListView.Cursor:=ACursor;
|
||||
//LogListView.Cursor:=ACursor;
|
||||
SVNLogMsgMemo.Cursor:=ACursor;
|
||||
SVNActionsListView.Cursor:=ACursor;
|
||||
//SVNActionsListView.Cursor:=ACursor;
|
||||
Self.Cursor:=ACursor;
|
||||
Application.ProcessMessages;
|
||||
end;
|
||||
|
||||
@ -313,16 +315,6 @@ begin
|
||||
Close;
|
||||
end;
|
||||
|
||||
procedure TSVNLogFrm.mnuOpenRevisionClick(Sender: TObject);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TSVNLogFrm.mnuOpenPrevRevisionClick(Sender: TObject);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TSVNLogFrm.mnuOpenCurentClick(Sender: TObject);
|
||||
var
|
||||
Path: String;
|
||||
@ -337,6 +329,21 @@ begin
|
||||
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);
|
||||
begin
|
||||
LogList := TFPList.Create;
|
||||
@ -368,6 +375,7 @@ begin
|
||||
for i := 0 to LogList.Count - 1 do
|
||||
TSVNLogItem(LogList[i]).Free;
|
||||
LogList.Free;
|
||||
SVNLogFrm := nil;
|
||||
end;
|
||||
|
||||
procedure TSVNLogFrm.Execute(Data: PtrInt);
|
||||
@ -524,8 +532,5 @@ begin
|
||||
ChangeCursor(crDefault);
|
||||
end;
|
||||
|
||||
finalization
|
||||
FreeAndNil(SVNLogFrm);
|
||||
|
||||
end.
|
||||
|
||||
|
||||
@ -8,13 +8,14 @@ object SVNStatusFrm: TSVNStatusFrm
|
||||
ClientWidth = 738
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
OnDestroy = FormDestroy
|
||||
OnShow = FormShow
|
||||
Position = poScreenCenter
|
||||
LCLVersion = '0.9.31'
|
||||
object ButtonPanel: TButtonPanel
|
||||
Left = 6
|
||||
Height = 34
|
||||
Top = 368
|
||||
Height = 38
|
||||
Top = 364
|
||||
Width = 726
|
||||
OKButton.Name = 'OKButton'
|
||||
OKButton.Caption = '&Commit'
|
||||
@ -34,8 +35,8 @@ object SVNStatusFrm: TSVNStatusFrm
|
||||
end
|
||||
object SVNFileListView: TListView
|
||||
Left = 6
|
||||
Height = 189
|
||||
Top = 173
|
||||
Height = 181
|
||||
Top = 177
|
||||
Width = 726
|
||||
Align = alClient
|
||||
BorderSpacing.Left = 6
|
||||
@ -45,39 +46,39 @@ object SVNStatusFrm: TSVNStatusFrm
|
||||
Columns = <
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 722
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 10
|
||||
end
|
||||
item
|
||||
AutoSize = True
|
||||
Width = 15
|
||||
Width = 624
|
||||
end>
|
||||
PopupMenu = PopupMenu1
|
||||
RowSelect = True
|
||||
@ -91,7 +92,7 @@ object SVNStatusFrm: TSVNStatusFrm
|
||||
object SVNCommitMsgMemo: TMemo
|
||||
Left = 6
|
||||
Height = 135
|
||||
Top = 33
|
||||
Top = 37
|
||||
Width = 726
|
||||
Align = alTop
|
||||
BorderSpacing.Left = 6
|
||||
@ -104,19 +105,19 @@ object SVNStatusFrm: TSVNStatusFrm
|
||||
Cursor = crVSplit
|
||||
Left = 0
|
||||
Height = 5
|
||||
Top = 168
|
||||
Top = 172
|
||||
Width = 738
|
||||
Align = alTop
|
||||
ResizeAnchor = akTop
|
||||
end
|
||||
object SVNCommitMsgHistoryComboBox: TComboBox
|
||||
Left = 6
|
||||
Height = 21
|
||||
Height = 25
|
||||
Top = 6
|
||||
Width = 726
|
||||
Align = alTop
|
||||
BorderSpacing.Around = 6
|
||||
ItemHeight = 13
|
||||
ItemHeight = 0
|
||||
OnChange = SVNCommitMsgHistoryComboBoxChange
|
||||
TabOrder = 4
|
||||
end
|
||||
|
||||
@ -209,7 +209,7 @@ begin
|
||||
exit;
|
||||
|
||||
//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
|
||||
begin
|
||||
@ -363,7 +363,8 @@ procedure TSVNStatusFrm.ChangeCursor(ACursor: TCursor);
|
||||
begin
|
||||
Cursor := ACursor;
|
||||
SVNCommitMsgMemo.Cursor := ACursor;
|
||||
SVNFileListView.Cursor := ACursor;
|
||||
//SVNFileListView.Cursor := ACursor;
|
||||
Self.Cursor := ACursor;
|
||||
Application.ProcessMessages;
|
||||
end;
|
||||
|
||||
@ -427,6 +428,11 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TSVNStatusFrm.FormDestroy(Sender: TObject);
|
||||
begin
|
||||
SVNStatusFrm := nil;
|
||||
end;
|
||||
|
||||
procedure TSVNStatusFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
var
|
||||
Config: TConfigStorage;
|
||||
@ -445,6 +451,8 @@ begin
|
||||
Config.Free;
|
||||
end;
|
||||
end;
|
||||
SVNStatus.Free;
|
||||
CloseAction := caFree;
|
||||
end;
|
||||
|
||||
procedure TSVNStatusFrm.CancelButtonClick(Sender: TObject);
|
||||
@ -452,13 +460,5 @@ begin
|
||||
Close;
|
||||
end;
|
||||
|
||||
procedure TSVNStatusFrm.FormDestroy(Sender: TObject);
|
||||
begin
|
||||
SVNStatus.Free;
|
||||
end;
|
||||
|
||||
finalization
|
||||
FreeAndNil(SVNStatusFrm);
|
||||
|
||||
end.
|
||||
|
||||
|
||||
@ -1,18 +1,20 @@
|
||||
object SVNUpdateFrm: TSVNUpdateFrm
|
||||
Left = 286
|
||||
Left = 375
|
||||
Height = 300
|
||||
Top = 209
|
||||
Top = 199
|
||||
Width = 640
|
||||
Caption = 'SVNUpdateFrm'
|
||||
ClientHeight = 300
|
||||
ClientWidth = 640
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
OnDestroy = FormDestroy
|
||||
OnShow = FormShow
|
||||
Position = poScreenCenter
|
||||
LCLVersion = '0.9.31'
|
||||
object SVNUpdateListView: TListView
|
||||
Left = 6
|
||||
Height = 248
|
||||
Height = 244
|
||||
Top = 6
|
||||
Width = 628
|
||||
Align = alClient
|
||||
@ -32,8 +34,8 @@ object SVNUpdateFrm: TSVNUpdateFrm
|
||||
end
|
||||
object ButtonPanel: TButtonPanel
|
||||
Left = 6
|
||||
Height = 34
|
||||
Top = 260
|
||||
Height = 38
|
||||
Top = 256
|
||||
Width = 628
|
||||
OKButton.Name = 'OKButton'
|
||||
OKButton.Caption = '&OK'
|
||||
|
||||
@ -35,7 +35,9 @@ type
|
||||
UpdatePopupMenu: TPopupMenu;
|
||||
ButtonPanel: TButtonPanel;
|
||||
SVNUpdateListView: TListView;
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure mnuShowDiffClick(Sender: TObject);
|
||||
procedure OKButtonClick(Sender: TObject);
|
||||
@ -86,6 +88,16 @@ begin
|
||||
mnuShowDiff.Caption:=rsShowDiff;
|
||||
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);
|
||||
begin
|
||||
Caption := Format(rsLazarusSVNUpdate, [RepositoryPath]);
|
||||
@ -209,8 +221,5 @@ begin
|
||||
MemStream.Free;
|
||||
end;
|
||||
|
||||
finalization
|
||||
FreeAndNil(SVNUpdateFrm);
|
||||
|
||||
end.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user