Fixed Message Warning - toMessySurface TransOption Added

diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas
index caccec9..b351ffa 100755 (executable)
--- a/bottleclient/BottleDef.pas
+++ b/bottleclient/BottleDef.pas
@@ -261,7 +261,8 @@ type
     toNoChoice,
     toIgnoreFrequentYenS,
     toWaitScriptEnd,
-    toFixMessySurface
+    toFixMessySurface,
+    toWarnMessySurface
   );
 
   TScriptTransOptions = set of TScriptTransOption;

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index ede6562..1a46e5a 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -323,7 +323,7 @@ begin
   Script := GetScriptText;
   if Pref.IgnoreTimeCritical then Opt := [toIgnoreTimeCritical] else Opt := [];
   if Pref.NoTransUrl then Opt := Opt + [toNoChoice];
-  Err := DoTrans(Script, Opt + [toConvertURL]);
+  Err := DoTrans(Script, Opt + [toConvertURL, toWarnMessySurface]);
   if Err <> '' then begin
     ShowMessage(Err);
     Exit;
@@ -481,9 +481,9 @@ begin
   end;
   YenETrans;
   Talk := GetScriptText;
-  Err := DoTrans(Talk, []);
+  Err := DoTrans(Talk, [toWarnMessySurface]);
   if Err <> '' then begin
-    ShowMessage(Err);
+    MessageDlg(Err, mtWarning, [mbOk], 0);
     Exit;
   end;
   Command := nil;
@@ -1131,10 +1131,12 @@ begin
   RegExp.Subst('s/\r\n//gk', Script);
 
   if not(LastSurfaceH in OkSurfaceH) or not(LastSurfaceU in OkSurfaceU) then begin
-    if MessageDlg('\96{\91Ì\91¤\82Ü\82½\82Í\82¤\82É\82ã\82¤\91¤\82Ì\83T\81[\83t\83B\83X\82ª\8dr\82ê\82Ä\82¢\82Ü\82·\81B'#13#10+
-      '\82±\82Ì\82Ü\82Ü\91\97\90M\82Å\82«\82Ü\82·\82ª\81A\8b\8c\83N\83\89\83C\83A\83\93\83g\82ÅBottle\82ª\8eó\90M\8b\91\94Û\82³\82ê\82é\82±\82Æ\82ª\82 \82è\82Ü\82·\81B',
-      mtWarning, mbOkCancel, 0) = mrCancel then
-        Result := '\83T\81[\83t\83B\83X\8dr\82ê\82Ì\82½\82ß\91\97\90M\82Å\82«\82Ü\82¹\82ñ\81B';
+    if (toWarnMessySurface in Options) then begin
+      if MessageDlg('\96{\91Ì\91¤\82Ü\82½\82Í\82¤\82É\82ã\82¤\91¤\82Ì\83T\81[\83t\83B\83X\82ª\8dr\82ê\82Ä\82¢\82Ü\82·\81B'#13#10+
+        '\82±\82Ì\82Ü\82Ü\91\97\90M\82Å\82«\82Ü\82·\82ª\81A\8b\8c\83N\83\89\83C\83A\83\93\83g\82ÅBottle\82ª\8eó\90M\8b\91\94Û\82³\82ê\82é\82±\82Æ\82ª\82 \82è\82Ü\82·\81B',
+        mtWarning, mbOkCancel, 0) = mrCancel then
+          Result := '\83T\81[\83t\83B\83X\8dr\82ê\82Ì\82½\82ß\91\97\90M\82Å\82«\82Ü\82¹\82ñ\81B';
+    end;
   end;
 
   //\83^\83O\83`\83F\83b\83N\8aÖ\98A