ダイアログを閉じる前のチェックを詳しくした

diff --git a/bottleclient/ReplacePresetEditor.pas b/bottleclient/ReplacePresetEditor.pas
index 27357f7..21465a8 100644 (file)
--- a/bottleclient/ReplacePresetEditor.pas
+++ b/bottleclient/ReplacePresetEditor.pas
@@ -223,11 +223,26 @@ begin
 end;
 
 procedure TfrmReplacePresetEditor.btnOkClick(Sender: TObject);
+var
+  i: integer;
 begin
   if Pairs.Count = 0 then
-    ShowMessage('\8dÅ\92á1\82Â\82Ì\92u\8a·\83\8b\81[\83\8b\82ð\90Ý\92è\82µ\82Ä\82­\82¾\82³\82¢')
-  else
-    ModalResult := mrOk;
+  begin
+    ShowMessage('\8dÅ\92á1\82Â\82Ì\92u\8a·\83\8b\81[\83\8b\82ð\90Ý\92è\82µ\82Ä\82­\82¾\82³\82¢');
+    Exit;
+  end;
+  for i := 0 to Pairs.Count-1 do
+    if not Pairs[i].IsValidPair then
+    begin
+      ShowMessage(Format('%d\94Ô\96Ú\82Ì\95¶\8e\9a\97ñ\83y\83A\82É\83G\83\89\81[\82ª\82 \82è\82Ü\82·', [i+1]));
+      Exit;
+    end;
+  if AskForTitle and (Title = '') then
+  begin
+    ShowMessage('\83v\83\8a\83Z\83b\83g\82Ì\83^\83C\83g\83\8b\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢');
+    Exit;
+  end;
+  ModalResult := mrOk;
 end;
 
 procedure TfrmReplacePresetEditor.btnCancelClick(Sender: TObject);