名前を付けて保存する部分を再修正。

ログ→エディタの部分で変更状態にならないように修正。

diff --git a/bottleclient/MainForm.dfm b/bottleclient/MainForm.dfm
index 6a69a7e..03c40ff 100755 (executable)
--- a/bottleclient/MainForm.dfm
+++ b/bottleclient/MainForm.dfm
@@ -2804,13 +2804,13 @@ object frmSender: TfrmSender
   end
   object OpenDialog: TOpenDialog
     DefaultExt = 'txt'
-    Filter = #12486#12461#12473#12488#12501#12449#12452#12523'(txt)|*.txt|'#20840#12390#12398#12501#12449#12452#12523'(*.*)|*.*'
+    Filter = #12486#12461#12473#12488#25991#26360'(*.txt)|*.txt|'#20840#12390#12398#12501#12449#12452#12523'|*.*'
     Left = 264
     Top = 112
   end
   object SaveDialog: TSaveDialog
     DefaultExt = 'txt'
-    Filter = #12486#12461#12473#12488#12501#12449#12452#12523'(*.txt)|*.txt'
+    Filter = #12486#12461#12473#12488#25991#26360'(*.txt)|*.txt|'#20840#12390#12398#12501#12449#12452#12523'|*.*'
     Left = 296
     Top = 112
   end

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index 91adb56..c2d9449 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -383,13 +383,15 @@ type
     procedure AppendXMLLog(const FileName: String; Args: THeadValue);
     //\8e©\93®\95Û\91¶\90Ý\92è
     procedure SetScriptAutoBackUp;
+    //\92P\91Ì\83t\83@\83C\83\8b\93ü\8fo\97Í\8aÖ\8cW
     procedure PerformFileOpen(AFileName: string);
-    procedure SetFileName(const FileName: String);
+    procedure SetFileName(const FileName: String; const Value: boolean);
     function CheckFileSave(Sender: TObject): integer;
     function FileSave(Sender: TObject): integer;
     function FileSaveAs(Sender: TObject): integer;
     procedure EditerStatusChange;
     procedure SetFileModified(const Value: boolean);
+    //\83u\83\89\83E\83U\94»\92f\82ÆURL\88ø\93n\82µ
     procedure OpenBrowser(const Url: string);
   protected
     procedure WndProc(var Message: TMessage); override;
@@ -1064,7 +1066,7 @@ begin
   //\83G\83f\83B\83^\93à\97e\82ª\95Ï\8dX\82³\82ê\82½\82Æ\82«
   EditerStatusChange;
   FScriptBackModified := true; //\8e©\93®\95Û\91¶\8dÄ\8aJ
-  SetFileModified(true);  //\83t\83@\83C\83\8b\95Ï\8dX\83t\83\89\83O
+  SetFileModified(true);       //\83t\83@\83C\83\8b\95Ï\8dX\83t\83\89\83O
 end;
 
 procedure TfrmSender.EditerStatusChange;
@@ -3144,6 +3146,8 @@ begin
   frmSender.actClear.Execute; // \8c»\8dÝ\82Ì\83X\83N\83\8a\83v\83g\82ð\83N\83\8a\83b\83v\82·\82é(\90Ý\92è\82É\82æ\82Á\82Ä)
   memScript.Lines.Clear;
   memScript.Lines.Add(Log.Script);
+  SetFileName(Log.MID, false);  //\83^\83C\83g\83\8b\82¾\82¯\95Ï\8dX
+  SetFileModified(false);       //\95Ï\8dX\96³\82µ\82É
   Ghost := Log.Ghost;
   //\83`\83\83\83\93\83l\83\8b\83S\81[\83X\83g\91Î\8dô
   if Ghost = '' then
@@ -3211,7 +3215,7 @@ begin
   if Visible then memScript.SetFocus;
 //  FScriptModified := false;
   FScriptBackModified := false; //\8e©\93®\95Û\91¶\88ê\8e\9e\92â\8e~
-  SetFileName(NewFileTitle);    //\83t\83@\83C\83\8b\82ð\90V\8bK\88µ\82¢\82É\82·\82é
+  SetFileName(NewFileTitle, true);    //\83t\83@\83C\83\8b\82ð\90V\8bK\88µ\82¢\82É\82·\82é
   SetFileModified(false);       //
   EditerStatusChange;           //\83X\83e\81[\83^\83X\8dX\90V
 end;
@@ -3568,7 +3572,7 @@ begin
       AFileName := NewFileTitle;
     end;
   end;
-  SetFileName(AFileName);
+  SetFileName(AFileName, true);
   memScript.SetFocus;
   EditerStatusChange;
   SetFileModified(false);
@@ -3582,12 +3586,12 @@ begin
     PerformFileOpen(OpenDialog.FileName);
 end;
 
-procedure TfrmSender.SetFileName(const FileName: String);
+procedure TfrmSender.SetFileName(const FileName: String; const Value: boolean);
 begin
-  //\83^\83C\83g\83\8b\95Ï\8dX
-  FFileName := FileName;
+  //\83^\83C\83g\83\8b\95Ï\8dX\82Æ\83t\83@\83C\83\8b\83p\83X\83Z\83b\83g
+  //\82à\82µ\81A\91æ\93ñ\88ø\90\94\82ªfalse\82È\82ç\83^\83C\83g\83\8b\82¾\82¯\95Ï\8dX
+  if Value then FFileName := FileName;
   Self.Caption := Format('%s - %s', [ExtractFileName(FileName), FOriginalCaption]);
-  StatusText := 'SSTP T';
 end;
 
 function TfrmSender.CheckFileSave(Sender: TObject): integer;
@@ -3595,10 +3599,11 @@ var
   Res: integer;
 begin
   //\83t\83@\83C\83\8b\82Ì\95Ï\8dX\82ð\8am\94F
+  //Result := idCancel\82Å\8fI\97¹\91j\8e~
   if FFileModified then
   begin
-    Res := MessageDlg(Format('\83t\83@\83C\83\8b %s \82Í\95Ï\8dX\82³\82ê\82Ä\82¢\82Ü\82·\81B'#13#10#13#10 + '\95Û\91¶\82µ\82Ü\82·\82©\81H', [FFileName]),
-      mtConfirmation, mbYesNoCancel, 0);
+    Res := MessageDlg(Format('\83t\83@\83C\83\8b %s \82Í\95Ï\8dX\82³\82ê\82Ä\82¢\82Ü\82·\81B'#13#10#13#10 +
+      '\95Û\91¶\82µ\82Ü\82·\82©\81H', [FFileName]), mtConfirmation, mbYesNoCancel, 0);
     if Res = idYes then Res := FileSave(Self);
   end else
     Res := idNo;
@@ -3611,7 +3616,7 @@ var
 begin
   //\8fã\8f\91\82«
   if FFileName = NewFileTitle then
-    Res := FileSaveAs(Sender)
+    Res := FileSaveAs(Sender) //\83p\83X\96¼\82ª\8ew\92è\82³\82ê\82Ä\82¢\82È\82¢\82Ì\82Å\8fã\8f\91\82«\82Å\82«\82È\82¢
   else
   begin
     try
@@ -3635,8 +3640,8 @@ begin
   if SaveDialog.Execute then
   begin
     if FileExists(SaveDialog.FileName) then
-      Res := MessageDlg(Format('%s \82Í\8aù\82É\91¶\8dÝ\82µ\82Ä\82¢\82Ü\82·\81B'#13#10 + '\8fã\8f\91\82«\82µ\82Ü\82·\82©\81H', [SaveDialog.FileName]),
-        mtConfirmation, mbYesNoCancel, 0);
+      Res := MessageDlg(Format('%s \82Í\8aù\82É\91¶\8dÝ\82µ\82Ä\82¢\82Ü\82·\81B'#13#10 + '\8fã\8f\91\82«\82µ\82Ü\82·\82©\81H',
+        [SaveDialog.FileName]), mtConfirmation, mbYesNoCancel, 0);
     if Res = idYes then
     begin
       try
@@ -3645,10 +3650,11 @@ begin
         on E: Exception do
           ShowMessage('\83G\83\89\81[:'#13#10#13#10 + E.Message);
       end;
-      SetFileName(SaveDialog.FileName);
+      SetFileName(SaveDialog.FileName, true);
       SetFileModified(false);
     end;
-  end;
+  end else
+    Res := idCancel;
   Result := Res;
 end;