From ea1f3a8d97eb4abe8b732547f3d1a5afaa76c4ce Mon Sep 17 00:00:00 2001 From: h677 Date: Sun, 25 Jun 2006 14:46:56 +0000 Subject: [PATCH] =?utf8?q?=E9=80=81=E4=BF=A1=E3=81=AE=E3=82=AD=E3=83=A3?= =?utf8?q?=E3=83=B3=E3=82=BB=E3=83=AB=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92?= =?utf8?q?=E4=B8=80=E9=83=A8=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Editor.pas | 201 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 91 insertions(+), 110 deletions(-) diff --git a/Editor.pas b/Editor.pas index 156916b..c8329d0 100644 --- a/Editor.pas +++ b/Editor.pas @@ -265,6 +265,8 @@ type procedure InputAssistMenuClick(Sender: TObject); //! TMemo‚̃J[ƒ\ƒ‹ˆÊ’u‚É•¶Žš—ñ‘}“ü procedure InsertText(Memo: TMemo; Text: String); + //! ‘—M’†Ž~ + procedure CancelSend(ABoard: TBoard; ASysMenu: HMENU); protected procedure CreateParams(var Params: TCreateParams); override; public @@ -305,17 +307,6 @@ const RES2CH_CHECK = ''; RES2CH_COOKIE = ''; - - //BBS2CH_NAME: string = '‚Q‚¿‚á‚ñ‚Ë‚é'; - //BBS2CH_LOG_FOLDER: string = '2ch'; - //EXTERNAL_LOG_FOLDER: string = 'exboard'; - - //FOLDER_INI_FILENAME: string = 'Folder.ini'; - //FOLDER_INDEX_FILENAME: string = 'Folder.idx'; - //SUBJECT_FILENAME: string = 'subject.txt'; - //PATH_DELIM: string = '\'; - - type TSelection = record StartPos, EndPos: Integer; @@ -681,6 +672,7 @@ end; function TEditorForm.Check: Boolean; const REQUIRED: string = '‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB'; + ERROR: string = 'ƒGƒ‰['; var Msg: string; rc: Integer; @@ -697,15 +689,15 @@ begin (Board.LastGetTime = ZERO_DATE)) then begin Msg := 'ƒT[ƒo‚ÌŽž‚ª•ª‚©‚ç‚È‚¢‚½‚߁A‘—Mo—ˆ‚Ü‚¹‚ñ'#13#10 + 'ƒXƒŒƒbƒh‚ðXViŽæ“¾jŒãA15•b‘Ò‚Á‚Ä‚©‚ç‘—M‚µ‚Ä‚­‚¾‚³‚¢'; - MsgBox(Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); + MsgBox(Handle, Msg, ERROR, MB_OK or MB_ICONSTOP); Result := False; end else if BodyEdit.Text = '' then begin Msg := '–{•¶' + REQUIRED; - MsgBox(Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); + MsgBox(Handle, Msg, ERROR, MB_OK or MB_ICONSTOP); Result := False; end else if (FBoard <> nil) and (Trim(TitleEdit.Text) = '') then begin Msg := 'ƒ^ƒCƒgƒ‹' + REQUIRED; - MsgBox(Handle, Msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP); + MsgBox(Handle, Msg, ERROR, MB_OK or MB_ICONSTOP); Result := False; end else begin if (not GikoSys.Dolib.Connected) and (AnsiPos('œ', NameComboBox.Text) <> 0) then begin @@ -816,6 +808,15 @@ begin Indy.Request.UserAgent := GikoSys.GetUserAgent; Indy.Request.AcceptEncoding := ''; end; +//! ‘—M’†Ž~‚Ì‚½‚߂̃ƒjƒ…[‚̍ж +procedure TEditorForm.CancelSend(ABoard: TBoard; ASysMenu: HMENU); +begin + ABoard.SPID := ''; + ABoard.PON := ''; + FWork := false; + EnableMenuItem(ASysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); + DrawMenuBar(Handle); +end; procedure TEditorForm.Send(ACOOKIE: string; SPID: string; PON: string; FirstWriting: Boolean); const @@ -923,96 +924,82 @@ begin //MsgResult‰Šú‰» MsgResult := IDNO; //ƒtƒVƒAƒiƒgƒ‰ƒbƒvŒx(LocalMode) by ’èŠú•Ö - if GikoSys.Setting.LocalTrapAtt then begin - if LFusianaGet(Namae) then begin - MsgResult := MsgBox( - Handle, MSG_FUSIANA, 'î•ñ', - MB_YESNO or MB_ICONQUESTION); - if MsgResult = IDNO then begin - Board.SPID := ''; - Board.PON := ''; - FWork := false; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; - end; - end; - if ((Namae = 'ŽRèÂ') or (Namae = 'fusianasan')) then begin - MsgResult := MsgBox( - Handle, MSG_FUSIANA, 'î•ñ', - MB_YESNO or MB_ICONQUESTION); - if MsgResult = IDNO then begin - Board.SPID := ''; - Board.PON := ''; - FWork := false; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; + if GikoSys.Setting.LocalTrapAtt then begin + if LFusianaGet(Namae) then begin + MsgResult := MsgBox( Handle, MSG_FUSIANA, 'î•ñ', + MB_YESNO or MB_ICONQUESTION); + if MsgResult = IDNO then begin + CancelSend( Board, SysMenu ); + Exit; + end; + end; + if ((Namae = 'ŽRèÂ') or (Namae = 'fusianasan')) then begin + MsgResult := MsgBox(Handle, MSG_FUSIANA, 'î•ñ', + MB_YESNO or MB_ICONQUESTION); + if MsgResult = IDNO then begin + CancelSend( Board, SysMenu ); + Exit; end; end; + end; + + if GikoSys.Setting.RemoteTrapAtt then begin + if FThreadItem = nil then + ABoard := FBoard + else + ABoard := FThreadItem.ParentBoard; + + if ABoard = nil then Exit; + + if FileExists(ABoard.GetSETTINGTXTFileName) then begin + body := TStringList.Create; + try + body.LoadFromFile(ABoard.GetSETTINGTXTFileName); + Remote := GetFusianaName(body, ABoard); + finally + body.Free; + end; + end; + + //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾ + //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤... + if not FileExists(ABoard.GetSETTINGTXTFileName) then begin + //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA + //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢ + tmpRawheader := Indy.Response.RawHeaders.Text; + GetSETTINGTXTAction.Execute; + body := TStringList.Create; + try + if FileExists(ABoard.GetSETTINGTXTFileName) then begin + body.LoadFromFile(ABoard.GetSETTINGTXTFileName); + Remote := GetFusianaName(body, ABoard); + end; + finally + body.Free; + end; end; - if GikoSys.Setting.RemoteTrapAtt then begin - if FThreadItem = nil then - ABoard := FBoard - else - ABoard := FThreadItem.ParentBoard; - - if ABoard = nil then Exit; - - if FileExists(ABoard.GetSETTINGTXTFileName) then begin - body := TStringList.Create; - try - body.LoadFromFile(ABoard.GetSETTINGTXTFileName); - Remote := GetFusianaName(body, ABoard); - finally - body.Free; - end; - end; - - //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾ - //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤... - if not FileExists(ABoard.GetSETTINGTXTFileName) then begin - //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA - //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢ - tmpRawheader := Indy.Response.RawHeaders.Text; - GetSETTINGTXTAction.Execute; - body := TStringList.Create; - try - if FileExists(ABoard.GetSETTINGTXTFileName) then begin - body.LoadFromFile(ABoard.GetSETTINGTXTFileName); - Remote := GetFusianaName(body, ABoard); - end; - finally - body.Free; - end; - end; - - if Remote = 'fusianasan' then begin - MsgResult := MsgBox( + if Remote = 'fusianasan' then begin + MsgResult := MsgBox( Handle, MSG_FUSIANA, 'î•ñ', - MB_YESNO or MB_ICONQUESTION); - if MsgResult = IDNO then begin - Board.SPID := ''; - Board.PON := ''; - FWork := false; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; + MB_YESNO or MB_ICONQUESTION); + if MsgResult = IDNO then begin + CancelSend( Board, SysMenu ); + Exit; + end; end; - end; - end; + end; if ResultType = grtOK then begin if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then WriteSambaTime(FHost, Now()); State := gdsComplete; end else if ResultType = grtCookie then begin - //ƒ‹[ƒv–hŽ~ - if not FirstWriting then - raise Exception.Create(''); - MsgResult := MsgBox( - Handle, + //ƒ‹[ƒv–hŽ~ + if not FirstWriting then + raise Exception.Create(''); + MsgResult := MsgBox( + Handle, 'E“Še‚³‚ꂽ“à—e‚̓Rƒs[A•Û‘¶Aˆø—pA“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 + 'E“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10#13#10 + '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H', @@ -1029,13 +1016,9 @@ begin //‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh Send(Board.Cookie, Board.SPID, Board.PON, False); Exit; - end else begin - Board.SPID := ''; - Board.PON := ''; - FWork := False; - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Exit; + end else begin + CancelSend( Board, SysMenu ); + Exit; end; end else if ResultType = grtCheck then begin //ƒ‹[ƒv–hŽ~ @@ -1065,18 +1048,14 @@ begin Send(Board.Cookie, Board.SPID, Board.PON, False); Exit; end else begin - EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); - DrawMenuBar(Handle); - Board.SPID := ''; - Board.PON := ''; - FWork := false; + CancelSend( Board, SysMenu ); Exit; end; end else begin - if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then - WriteSambaTime(FHost, Now()); - State := gdsError; - raise Exception.Create(''); + if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then + WriteSambaTime(FHost, Now()); + State := gdsError; + raise Exception.Create(''); end; except @@ -1260,6 +1239,8 @@ begin end; procedure TEditorForm.SendActionExecute(Sender: TObject); +const + TITLE_SAMBA : string = 'Samba24Œx'; var Board: TBoard; rc: Integer; @@ -1347,7 +1328,7 @@ begin rc := GikoUtil.MsgBox(Handle, 'Samba24‚Ì‹K’è’l–¢–ž‚Ì•b”‚µ‚©Œo‰ß‚µ‚Ä‚¢‚Ü‚¹‚ñB'#13#10 + '‘—M‚𒆎~‚µ‚Ü‚·‚©H' + #13#10 - + '(u‚¢‚¢‚¦v‚¾‚Æ‘—M‚µ‚Ü‚·)', 'Samba24Œx', + + '(u‚¢‚¢‚¦v‚¾‚Æ‘—M‚µ‚Ü‚·)', TITLE_SAMBA, MB_YESNO or MB_ICONQUESTION); if rc = IDYES then begin FWork := false; @@ -1356,7 +1337,7 @@ begin if rc = IDNO then begin rc2 := GikoUtil.MsgBox(Handle, '–{“–‚É‘—M‚µ‚Ü‚·‚©H', - 'Sumba24Œx', + TITLE_SAMBA, MB_YESNO or MB_ICONQUESTION); if rc2 = IDNO then begin FWork := False; -- 2.11.0