Skip to content

Commit bc7fefa

Browse files
committed
Fix issue where dialogs could be confirmed even if a validation error occurred
1 parent 5e33e52 commit bc7fefa

13 files changed

Lines changed: 8 additions & 8 deletions

‎src/O2/o2.dproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
8989
<DCC_DependencyCheckOutputName>o2.exe</DCC_DependencyCheckOutputName>
9090
<SanitizedProjectName>o2</SanitizedProjectName>
91-
<VerInfo_Build>571</VerInfo_Build>
92-
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.3.1.571;InternalName=O2;LegalCopyright=(C) 2004-2026 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.3.1;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
91+
<VerInfo_Build>572</VerInfo_Build>
92+
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.3.1.572;InternalName=O2;LegalCopyright=(C) 2004-2026 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.3.1;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
9393
<BT_BuildType>Debug</BT_BuildType>
9494
</PropertyGroup>
9595
<PropertyGroup Condition="'$(Cfg_2)'!=''">

‎src/O2/o2.res‎

0 Bytes
Binary file not shown.

‎src/O2/uFilePropsDlg.dfm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ object FilePropsDlg: TFilePropsDlg
111111
Anchors = [akRight, akBottom]
112112
Caption = 'OK'
113113
Default = True
114-
ModalResult = 1
115114
TabOrder = 5
116115
OnClick = btOkClick
117116
end

‎src/O2/uFilePropsDlg.pas‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ procedure TFilePropsDlg.SetModel(const Value: IFileProps);
9999
procedure TFilePropsDlg.btOkClick(Sender: TObject);
100100
begin
101101
FModel.ApplyChanges;
102+
ModalResult := mrOk;
102103
end;
103104

104105
end.

‎src/O2/uObjPropsDlg.dfm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ object ObjPropsDlg: TObjPropsDlg
297297
Action = OK
298298
Anchors = [akRight, akBottom]
299299
Default = True
300-
ModalResult = 1
301300
TabOrder = 1
302301
ExplicitLeft = 220
303302
ExplicitTop = 408

‎src/O2/uObjPropsDlg.pas‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ procedure TObjPropsDlg.OKExecute(Sender: TObject);
314314
FModel.ObjectNotes := Memo.Lines;
315315

316316
FModel.ApplyChanges;
317+
ModalResult := mrOk;
317318
end;
318319

319320
procedure TObjPropsDlg.OKUpdate(Sender: TObject);

‎src/O2/uRelationPropsDlg.dfm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ object RelationPropsDlg: TRelationPropsDlg
9999
Anchors = [akRight, akBottom]
100100
Caption = 'OK'
101101
Default = True
102-
ModalResult = 1
103102
TabOrder = 4
104103
OnClick = btOkClick
105104
end

‎src/O2/uRelationPropsDlg.pas‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ procedure TRelationPropsDlg.cbRole2Change(Sender: TObject);
9494
procedure TRelationPropsDlg.btOkClick(Sender: TObject);
9595
begin
9696
FModel.ApplyChanges;
97+
ModalResult := mrOk;
9798
end;
9899

99100
end.

‎src/O2/uRulePropsDlg.dfm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ object RulePropsDlg: TRulePropsDlg
2525
Action = OK
2626
Anchors = [akRight, akBottom]
2727
Default = True
28-
ModalResult = 1
2928
TabOrder = 1
3029
end
3130
object btCancel: TButton

‎src/O2/uRulePropsDlg.pas‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ procedure TRulePropsDlg.FormShow(Sender: TObject);
235235
procedure TRulePropsDlg.OKExecute(Sender: TObject);
236236
begin
237237
FModel.ApplyChanges;
238+
ModalResult := mrOk;
238239
end;
239240

240241
procedure TRulePropsDlg.OKUpdate(Sender: TObject);

0 commit comments

Comments
 (0)